[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  833104e6bdfc41db06bf22e129d0ab43278628c5 (commit)
      from  fbd3e06b64a1d4733eb95fc3ed0e35bb4c3a726e (commit)


- Log -----------------------------------------------------------------
commit 833104e6bdfc41db06bf22e129d0ab43278628c5
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Jul 9 21:22:26 2017 +0200

    Fix crash in BUF_MEM_grow_clean.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/3896)
    
    (cherry picked from commit e1ca9e1f6db97052a0ebea6591f323b12b1e0020)

-----------------------------------------------------------------------

Summary of changes:
 crypto/buffer/buffer.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index 6b0bd4a..ad7128a 100644
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -62,9 +62,11 @@ static char *sec_alloc_realloc(BUF_MEM *str, size_t len)
 
     ret = OPENSSL_secure_malloc(len);
     if (str->data != NULL) {
-        if (ret != NULL)
+        if (ret != NULL) {
             memcpy(ret, str->data, str->length);
-        OPENSSL_secure_free(str->data);
+            OPENSSL_secure_free(str->data);
+            str->data = NULL;
+        }
     }
     return (ret);
 }