X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmem.c;h=159e143c09cbe4a20b96f2ffca20afe9194b06c5;hb=fd0ba77717c4fda075c9c9a6ff1e5975fdf76905;hp=f7984fa958eb1edd6c61f6667f3f2b29753be662;hpb=71fa451343f97b3624374ed1359adc23fba5696e;p=oweals%2Fopenssl.git diff --git a/crypto/mem.c b/crypto/mem.c index f7984fa958..159e143c09 100644 --- 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; - 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); @@ -298,10 +300,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);