diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 15:20:57 -0500 |
commit | ee914bf036b78dcbde9bf694794c15482d721028 (patch) | |
tree | 13793fdc02dbf47bd4dd5e93861bccac71d58887 /openssl/crypto/mem.c | |
parent | faa5026e540d03f858265b2796054d685f687383 (diff) | |
download | vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.gz vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.tar.bz2 vcxsrv-ee914bf036b78dcbde9bf694794c15482d721028.zip |
Update openssl to version openssl-1.0.1k
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/crypto/mem.c')
-rw-r--r-- | openssl/crypto/mem.c | 12 |
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); |