summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/mem.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2002-09-14 11:18:01 +0000
committermarkus <markus@openbsd.org>2002-09-14 11:18:01 +0000
commitcf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2 (patch)
tree2658bb71397039b6e8ea6265a0bfe5a109de2a64 /lib/libcrypto/mem.c
parentspaces (diff)
downloadwireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.tar.xz
wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.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 'lib/libcrypto/mem.c')
-rw-r--r--lib/libcrypto/mem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libcrypto/mem.c b/lib/libcrypto/mem.c
index effec714e82..a7826908e61 100644
--- a/lib/libcrypto/mem.c
+++ b/lib/libcrypto/mem.c
@@ -303,6 +303,9 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
{
void *ret = NULL;
+ if (str == NULL)
+ return CRYPTO_malloc(num, file, line);
+
if (realloc_debug_func != NULL)
realloc_debug_func(str, NULL, num, file, line, 0);
ret = realloc_ex_func(str,num,file,line);