From: Vladimír Kotal <vladimir.kotal@oracle.com>
Date: Fri, 16 Jun 2023 14:25:58 +0000 (+0200)
Subject: return immediately if namemap is NULL
X-Git-Tag: openssl-3.2.0-alpha1~613
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d808fa015132d63f06f555649bc4b3f0e2e5124e;p=thirdparty%2Fopenssl.git

return immediately if namemap is NULL

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21223)
---

diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index e2909d71978..25e0eb90ebb 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -137,6 +137,9 @@ int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
     cbdata.number = number;
     cbdata.found = 0;
 
+    if (namemap == NULL)
+        return 0;
+
     /*
      * We collect all the names first under a read lock. Subsequently we call
      * the user function, so that we're not holding the read lock when in user