From: Ben Laurie <ben@links.org>
Date: Wed, 4 May 2016 10:45:49 +0000 (+0100)
Subject: memset() doesn't take NULL.
X-Git-Tag: OpenSSL_1_1_0-pre6~903
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cf14ce074dfd1780ae4c68b2e7f083bfaf47530;p=openssl

memset() doesn't take NULL.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index a16f3bd342..1c76d662a6 100644
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -128,7 +128,8 @@ size_t BUF_MEM_grow(BUF_MEM *str, size_t len)
         return (len);
     }
     if (str->max >= len) {
-        memset(&str->data[str->length], 0, len - str->length);
+        if (str->data != NULL)
+            memset(&str->data[str->length], 0, len - str->length);
         str->length = len;
         return (len);
     }
@@ -160,7 +161,8 @@ size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
     size_t n;
 
     if (str->length >= len) {
-        memset(&str->data[len], 0, str->length - len);
+        if (str->data != NULL)
+            memset(&str->data[len], 0, str->length - len);
         str->length = len;
         return (len);
     }