aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/crypto/mem.c')
-rw-r--r--openssl/crypto/mem.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/openssl/crypto/mem.c b/openssl/crypto/mem.c
index 1cc62eafd..01052cfa3 100644
--- a/openssl/crypto/mem.c
+++ b/openssl/crypto/mem.c
@@ -255,10 +255,12 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
if (num <= 0) return NULL;
- allow_customize = 0;
+ if(allow_customize)
+ allow_customize = 0;
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);
@@ -299,10 +301,12 @@ void *CRYPTO_malloc(int num, const char *file, int line)
if (num <= 0) return NULL;
- allow_customize = 0;
+ if(allow_customize)
+ allow_customize = 0;
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);