From: Eric Covener <covener@apache.org>
Date: Fri, 31 Jul 2020 01:21:25 +0000 (+0000)
Subject: don't try to load modules from a NULL path
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fafffc8aa18bbed18d7cefa10bea7ee8c3d4227;p=thirdparty%2Fapache%2Fhttpd.git

don't try to load modules from a NULL path

ap_server_root_relative() can fail if apr_filepath_merge fails,
which can happen with a "bad" drive/volume or who knows what
else on Windows. Regardless, if !fullname we are already
going to retry wih what was actually passed.




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

diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c
index 6eafbe9aeab..f5d18c17404 100644
--- a/modules/core/mod_so.c
+++ b/modules/core/mod_so.c
@@ -159,7 +159,7 @@ static const char *dso_load(cmd_parms *cmd, apr_dso_handle_t **modhandlep,
                             cmd->cmd->name, filename);
     }
     *used_filename = fullname;
-    if (apr_dso_load(modhandlep, fullname, cmd->pool) == APR_SUCCESS) {
+    if (fullname && apr_dso_load(modhandlep, fullname, cmd->pool) == APR_SUCCESS) {
         return NULL;
     }
     if (retry) {