diff options
| author | kyungwook tak <k.tak@samsung.com> | 2015-03-12 11:36:31 +0900 |
|---|---|---|
| committer | kyungwook tak <k.tak@samsung.com> | 2015-03-12 11:42:31 +0900 |
| commit | 057bf157b3a518b7a0fa333c5d4c907df5b9cb4a (patch) | |
| tree | b4ee9b579b660890d23f72d4ea098e72f1a484de /crypto/mem.c | |
| parent | b87d7a90f2f67d906be0ee4d2ed9c4fa189d39a9 (diff) | |
| download | openssl-upstream/1.0.1l.tar.gz openssl-upstream/1.0.1l.tar.bz2 openssl-upstream/1.0.1l.zip | |
Imported Upstream version 1.0.1lupstream/1.0.1l
Change-Id: I99680d38528c4117e59bb5377cc54820b22b93a2
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index 1cc62ea..01052cf 100644 --- a/crypto/mem.c +++ b/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); |