projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make update
[oweals/openssl.git]
/
crypto
/
mem.c
diff --git
a/crypto/mem.c
b/crypto/mem.c
index f7984fa958eb1edd6c61f6667f3f2b29753be662..159e143c09cbe4a20b96f2ffca20afe9194b06c5 100644
(file)
--- a/
crypto/mem.c
+++ b/
crypto/mem.c
@@
-254,10
+254,12
@@
void *CRYPTO_malloc_locked(int num, const char *file, int line)
if (num <= 0) return NULL;
if (num <= 0) return NULL;
- allow_customize = 0;
+ if(allow_customize)
+ allow_customize = 0;
if (malloc_debug_func != NULL)
{
if (malloc_debug_func != NULL)
{
- allow_customize_debug = 0;
+ if(allow_customize_debug)
+ allow_customize_debug = 0;
malloc_debug_func(NULL, num, file, line, 0);
}
ret = malloc_locked_ex_func(num,file,line);
malloc_debug_func(NULL, num, file, line, 0);
}
ret = malloc_locked_ex_func(num,file,line);
@@
-298,10
+300,12
@@
void *CRYPTO_malloc(int num, const char *file, int line)
if (num <= 0) return NULL;
if (num <= 0) return NULL;
- allow_customize = 0;
+ if(allow_customize)
+ allow_customize = 0;
if (malloc_debug_func != NULL)
{
if (malloc_debug_func != NULL)
{
- allow_customize_debug = 0;
+ if(allow_customize_debug)
+ allow_customize_debug = 0;
malloc_debug_func(NULL, num, file, line, 0);
}
ret = malloc_ex_func(num,file,line);
malloc_debug_func(NULL, num, file, line, 0);
}
ret = malloc_ex_func(num,file,line);