diff options
author | markus <> | 2002-09-14 11:18:04 +0000 |
---|---|---|
committer | markus <> | 2002-09-14 11:18:04 +0000 |
commit | 3a3a489a756f2852d798376f20cc0d4ab609c866 (patch) | |
tree | 2a4277fc9b7635e82c33faa3bae9f9380bc639e8 /src/lib/libcrypto/mem.c | |
parent | 82d2611e1bb67683df1bb201dcc2afbff4c76980 (diff) | |
download | openbsd-3a3a489a756f2852d798376f20cc0d4ab609c866.tar.gz openbsd-3a3a489a756f2852d798376f20cc0d4ab609c866.tar.bz2 openbsd-3a3a489a756f2852d798376f20cc0d4ab609c866.zip |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'src/lib/libcrypto/mem.c')
-rw-r--r-- | src/lib/libcrypto/mem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c index effec714e8..a7826908e6 100644 --- a/src/lib/libcrypto/mem.c +++ b/src/lib/libcrypto/mem.c | |||
@@ -303,6 +303,9 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line) | |||
303 | { | 303 | { |
304 | void *ret = NULL; | 304 | void *ret = NULL; |
305 | 305 | ||
306 | if (str == NULL) | ||
307 | return CRYPTO_malloc(num, file, line); | ||
308 | |||
306 | if (realloc_debug_func != NULL) | 309 | if (realloc_debug_func != NULL) |
307 | realloc_debug_func(str, NULL, num, file, line, 0); | 310 | realloc_debug_func(str, NULL, num, file, line, 0); |
308 | ret = realloc_ex_func(str,num,file,line); | 311 | ret = realloc_ex_func(str,num,file,line); |