]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
don't try to load modules from a NULL path
authorEric Covener <covener@apache.org>
Fri, 31 Jul 2020 01:21:25 +0000 (01:21 +0000)
committerEric Covener <covener@apache.org>
Fri, 31 Jul 2020 01:21:25 +0000 (01:21 +0000)
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

modules/core/mod_so.c

index 6eafbe9aeab0ea1acf1f201e14b4192e408098f7..f5d18c17404908a58ef8807119d4547e44182d0f 100644 (file)
@@ -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) {