From: Matt Caswell <matt@openssl.org>
Date: Thu, 17 Oct 2019 16:19:21 +0000 (+0100)
Subject: Allow strings in params to be of zero length
X-Git-Tag: openssl-3.0.0-alpha1~960
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46ef075a99b3ea8e8bd5641405f745c43fdaefb2;p=oweals%2Fopenssl.git

Allow strings in params to be of zero length

Sometimes it is useful to be able to pass NULL/zero length strings

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10152)
---

diff --git a/crypto/params.c b/crypto/params.c
index 58a4710e47..5d1fc6a6f2 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -776,6 +776,9 @@ static int get_string_internal(const OSSL_PARAM *p, void **val, size_t max_len,
     if (used_len != NULL)
         *used_len = sz;
 
+    if (sz == 0)
+        return 1;
+
     if (*val == NULL) {
         char *const q = OPENSSL_malloc(sz);