From: Stefan Eissing <icing@apache.org>
Date: Wed, 16 Mar 2022 08:28:27 +0000 (+0000)
Subject:   *) mod_md: fix compiler warning about NULL arg to a %s log. Fixes PR 65955.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e76422db42887e2abc8eeff123d0af8ed41bc9d6;p=thirdparty%2Fapache%2Fhttpd.git

  *) mod_md: fix compiler warning about NULL arg to a %s log. Fixes PR 65955.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898962 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/md/md_store_fs.c b/modules/md/md_store_fs.c
index ab43054ce58..c2a4a4e4930 100644
--- a/modules/md/md_store_fs.c
+++ b/modules/md/md_store_fs.c
@@ -503,6 +503,7 @@ static apr_status_t mk_group_dir(const char **pdir, md_store_fs_t *s_fs,
     
     perms = gperms(s_fs, group);
 
+    *pdir = NULL;
     rv = fs_get_dname(pdir, &s_fs->s, group, name, p);
     if ((APR_SUCCESS != rv) || (MD_SG_NONE == group)) goto cleanup;
 
@@ -521,7 +522,8 @@ static apr_status_t mk_group_dir(const char **pdir, md_store_fs_t *s_fs,
     }
 cleanup:
     if (APR_SUCCESS != rv) {
-        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "mk_group_dir %d %s", group, name);
+        md_log_perror(MD_LOG_MARK, MD_LOG_ERR, rv, p, "mk_group_dir %d %s",
+            group, (*pdir? *pdir : (name? name : "(null)")));
     }
     return rv;
 }