Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
75acc288
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
75acc288
编写于
12月 18, 1999
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix typos and other little errors ...
上级
0cd08cce
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
26 deletion
+18
-26
apps/openssl.c
apps/openssl.c
+1
-1
crypto/crypto.h
crypto/crypto.h
+2
-2
crypto/mem_dbg.c
crypto/mem_dbg.c
+15
-23
未找到文件。
apps/openssl.c
浏览文件 @
75acc288
...
@@ -237,7 +237,7 @@ end:
...
@@ -237,7 +237,7 @@ end:
ERR_free_strings
();
ERR_free_strings
();
#ifdef LEVITTE_DEBUG
#ifdef LEVITTE_DEBUG
/* Just to make sure I get a memory leak I can see :-) */
CRYPTO_add_info
(
"Just to make sure I get a memory leak I can see :-)"
);
(
void
)
Malloc
(
1024
);
(
void
)
Malloc
(
1024
);
#endif
#endif
...
...
crypto/crypto.h
浏览文件 @
75acc288
...
@@ -213,7 +213,7 @@ typedef struct crypto_ex_data_func_st
...
@@ -213,7 +213,7 @@ typedef struct crypto_ex_data_func_st
#endif
#endif
/* Set standard debugging functions (not done by default
/* Set standard debugging functions (not done by default
* unless CRYPTO_MDEBUG is
t
defined) */
* unless CRYPTO_MDEBUG is defined) */
#define CRYPTO_malloc_debug_init() do {\
#define CRYPTO_malloc_debug_init() do {\
CRYPTO_set_mem_debug_functions(\
CRYPTO_set_mem_debug_functions(\
(void (*)())CRYPTO_dbg_malloc,\
(void (*)())CRYPTO_dbg_malloc,\
...
@@ -304,7 +304,7 @@ long CRYPTO_get_mem_debug_options();
...
@@ -304,7 +304,7 @@ long CRYPTO_get_mem_debug_options();
#define CRYPTO_add_info(info) \
#define CRYPTO_add_info(info) \
CRYPTO_add_info_(info, __FILE__, __LINE__);
CRYPTO_add_info_(info, __FILE__, __LINE__);
int
CRYPTO_add_info_
(
const
char
*
file
,
int
line
,
const
char
*
info
);
int
CRYPTO_add_info_
(
const
char
*
info
,
const
char
*
file
,
int
line
);
int
CRYPTO_remove_info
(
void
);
int
CRYPTO_remove_info
(
void
);
int
CRYPTO_remove_all_info
(
void
);
int
CRYPTO_remove_all_info
(
void
);
...
...
crypto/mem_dbg.c
浏览文件 @
75acc288
...
@@ -286,14 +286,14 @@ static APP_INFO *remove_info()
...
@@ -286,14 +286,14 @@ static APP_INFO *remove_info()
return
(
ret
);
return
(
ret
);
}
}
int
CRYPTO_add_info_
(
const
char
*
file
,
int
line
,
const
char
*
info
)
int
CRYPTO_add_info_
(
const
char
*
info
,
const
char
*
file
,
int
line
)
{
{
APP_INFO
*
ami
,
*
amim
;
APP_INFO
*
ami
,
*
amim
;
int
ret
=
0
;
int
ret
=
0
;
if
(
is_MemCheck_on
())
if
(
is_MemCheck_on
())
{
{
MemCheck_off
();
MemCheck_off
();
/* obtains CRYPTO_LOCK_MALLOC2 */
if
((
ami
=
(
APP_INFO
*
)
Malloc
(
sizeof
(
APP_INFO
)))
==
NULL
)
if
((
ami
=
(
APP_INFO
*
)
Malloc
(
sizeof
(
APP_INFO
)))
==
NULL
)
{
{
...
@@ -330,7 +330,7 @@ int CRYPTO_add_info_(const char *file, int line, const char *info)
...
@@ -330,7 +330,7 @@ int CRYPTO_add_info_(const char *file, int line, const char *info)
ami
->
next
=
amim
;
ami
->
next
=
amim
;
}
}
err:
err:
MemCheck_on
();
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
}
}
return
(
ret
);
return
(
ret
);
...
@@ -340,15 +340,13 @@ int CRYPTO_remove_info(void)
...
@@ -340,15 +340,13 @@ int CRYPTO_remove_info(void)
{
{
int
ret
=
0
;
int
ret
=
0
;
if
(
is_MemCheck_on
())
/* _must_ be true, or something went severly wrong */
if
(
is_MemCheck_on
())
/* _must_ be true, or something went sever
e
ly wrong */
{
{
MemCheck_off
();
MemCheck_off
();
/* obtains CRYPTO_LOCK_MALLOC2 */
CRYPTO_w_lock
(
CRYPTO_LOCK_MALLOC
);
ret
=
(
remove_info
()
!=
NULL
);
ret
=
(
remove_info
()
!=
NULL
);
CRYPTO_w_unlock
(
CRYPTO_LOCK_MALLOC
);
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
MemCheck_on
();
}
}
return
(
ret
);
return
(
ret
);
}
}
...
@@ -359,14 +357,12 @@ int CRYPTO_remove_all_info(void)
...
@@ -359,14 +357,12 @@ int CRYPTO_remove_all_info(void)
if
(
is_MemCheck_on
())
/* _must_ be true */
if
(
is_MemCheck_on
())
/* _must_ be true */
{
{
MemCheck_off
();
MemCheck_off
();
/* obtains CRYPTO_LOCK_MALLOC2 */
CRYPTO_w_lock
(
CRYPTO_LOCK_MALLOC
);
while
(
remove_info
()
!=
NULL
)
while
(
remove_info
()
!=
NULL
)
ret
++
;
ret
++
;
CRYPTO_w_unlock
(
CRYPTO_LOCK_MALLOC
);
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
MemCheck_on
();
}
}
return
(
ret
);
return
(
ret
);
}
}
...
@@ -389,14 +385,13 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
...
@@ -389,14 +385,13 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
if
(
is_MemCheck_on
())
if
(
is_MemCheck_on
())
{
{
MemCheck_off
();
MemCheck_off
();
/* obtains CRYPTO_LOCK_MALLOC2 */
if
((
m
=
(
MEM
*
)
Malloc
(
sizeof
(
MEM
)))
==
NULL
)
if
((
m
=
(
MEM
*
)
Malloc
(
sizeof
(
MEM
)))
==
NULL
)
{
{
Free
(
addr
);
Free
(
addr
);
MemCheck_on
();
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
return
;
return
;
}
}
CRYPTO_w_lock
(
CRYPTO_LOCK_MALLOC
);
if
(
mh
==
NULL
)
if
(
mh
==
NULL
)
{
{
if
((
mh
=
lh_new
(
mem_hash
,
mem_cmp
))
==
NULL
)
if
((
mh
=
lh_new
(
mem_hash
,
mem_cmp
))
==
NULL
)
...
@@ -453,8 +448,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
...
@@ -453,8 +448,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
Free
(
mm
);
Free
(
mm
);
}
}
err:
err:
CRYPTO_w_unlock
(
CRYPTO_LOCK_MALLOC
);
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
MemCheck_on
();
}
}
break
;
break
;
}
}
...
@@ -490,7 +484,7 @@ void CRYPTO_dbg_free(void *addr, int before_p)
...
@@ -490,7 +484,7 @@ void CRYPTO_dbg_free(void *addr, int before_p)
Free
(
mp
);
Free
(
mp
);
}
}
MemCheck_on
();
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
}
}
break
;
break
;
case
1
:
case
1
:
...
@@ -524,8 +518,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
...
@@ -524,8 +518,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
if
(
is_MemCheck_on
())
if
(
is_MemCheck_on
())
{
{
MemCheck_off
();
MemCheck_off
();
/* obtains CRYPTO_LOCK_MALLOC2 */
CRYPTO_w_lock
(
CRYPTO_LOCK_MALLOC
);
m
.
addr
=
addr1
;
m
.
addr
=
addr1
;
mp
=
(
MEM
*
)
lh_delete
(
mh
,(
char
*
)
&
m
);
mp
=
(
MEM
*
)
lh_delete
(
mh
,(
char
*
)
&
m
);
...
@@ -542,8 +535,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
...
@@ -542,8 +535,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
lh_insert
(
mh
,(
char
*
)
mp
);
lh_insert
(
mh
,(
char
*
)
mp
);
}
}
CRYPTO_w_unlock
(
CRYPTO_LOCK_MALLOC
);
MemCheck_on
();
/* releases CRYPTO_LOCK_MALLOC2 */
MemCheck_on
();
}
}
break
;
break
;
}
}
...
@@ -610,7 +602,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
...
@@ -610,7 +602,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
ami_cnt
++
;
ami_cnt
++
;
memset
(
buf
,
'>'
,
ami_cnt
);
memset
(
buf
,
'>'
,
ami_cnt
);
sprintf
(
buf
+
ami_cnt
,
sprintf
(
buf
+
ami_cnt
,
"thread=%lu, file=%s, line=%d, info=
\"
"
,
"
thread=%lu, file=%s, line=%d, info=
\"
"
,
amip
->
thread
,
amip
->
file
,
amip
->
line
);
amip
->
thread
,
amip
->
file
,
amip
->
line
);
buf_len
=
strlen
(
buf
);
buf_len
=
strlen
(
buf
);
info_len
=
strlen
(
amip
->
info
);
info_len
=
strlen
(
amip
->
info
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录