From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 28 Jun 2021 15:13:31 +0000 (+0200)
Subject: coverity #1486532: fix potential NULL dereference in test_mk_file_path()
X-Git-Tag: openssl-3.0.0-beta2~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=452580e5b0f85201006bacb1a697e0c5b7154b76;p=thirdparty%2Fopenssl.git

coverity #1486532: fix potential NULL dereference in test_mk_file_path()

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15942)
---

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index f91d1ab9325..8568a51fd70 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -439,11 +439,12 @@ char *test_mk_file_path(const char *dir, const char *file)
     char *dir_end;
     char dir_end_sep;
 # endif
-    size_t len = strlen(dir) + strlen(sep) + strlen(file) + 1;
+    size_t dirlen = dir != NULL ? strlen(dir) : 0;
+    size_t len = dirlen + strlen(sep) + strlen(file) + 1;
     char *full_file = OPENSSL_zalloc(len);
 
     if (full_file != NULL) {
-        if (dir != NULL && dir[0] != '\0') {
+        if (dir != NULL && dirlen > 0) {
             OPENSSL_strlcpy(full_file, dir, len);
 # ifdef OPENSSL_SYS_VMS
             /*