From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 21 Apr 2016 14:30:17 +0000 (+0100)
Subject: Fix CRYPTO_clear_realloc() bug.
X-Git-Tag: OpenSSL_1_1_0-pre6~1084
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ac7753c107e71bfdcaa08b18eb4e6683292be57;p=oweals%2Fopenssl.git

Fix CRYPTO_clear_realloc() bug.

If allocation in CRYPTO_clear_realloc() fails don't free up the original
buffer: this is consistent with the behaviour of realloc(3) and is expected
in other places in OpenSSL.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/crypto/mem.c b/crypto/mem.c
index 16ef64c6fe..9bdd5043a9 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -201,9 +201,10 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
     }
 
     ret = CRYPTO_malloc(num, file, line);
-    if (ret)
+    if (ret != NULL) {
         memcpy(ret, str, old_len);
-    CRYPTO_clear_free(str, old_len, file, line);
+        CRYPTO_clear_free(str, old_len, file, line);
+    }
     return ret;
 }