From: XZ-X <xu1415@purdue.edu>
Date: Mon, 22 Jul 2024 05:38:00 +0000 (-0400)
Subject: rehash.c: handle possible null pointer returned by OPENSSL_strdup
X-Git-Tag: openssl-3.1.8~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44a7fd8717e05cf0a9de1879acf0dffb4acad61d;p=thirdparty%2Fopenssl.git

rehash.c: handle possible null pointer returned by OPENSSL_strdup

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24980)

(cherry picked from commit a5cd06f7fff3b4484946812191097b5e080b7610)
---

diff --git a/apps/rehash.c b/apps/rehash.c
index 85eee385794..6e0ca3642c4 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -559,6 +559,11 @@ int rehash_main(int argc, char **argv)
     } else if ((env = getenv(X509_get_default_cert_dir_env())) != NULL) {
         char lsc[2] = { LIST_SEPARATOR_CHAR, '\0' };
         m = OPENSSL_strdup(env);
+        if (m == NULL) {
+            BIO_puts(bio_err, "out of memory\n");
+            errs = 1;
+            goto end;
+        }
         for (e = strtok(m, lsc); e != NULL; e = strtok(NULL, lsc))
             errs += do_dir(e, h);
         OPENSSL_free(m);