From 5cf14ce074dfd1780ae4c68b2e7f083bfaf47530 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Wed, 4 May 2016 11:45:49 +0100 Subject: [PATCH] memset() doesn't take NULL. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper --- 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 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); } -- 2.34.1