svn commit: r1880461 - /httpd/httpd/trunk/modules/core/mod_so.c

[co...@apache.org]

Author: covener
Date: Fri Jul 31 01:21:25 2020
New Revision: 1880461

URL: http://svn.apache.org/viewvc?rev=1880461&view=rev
Log:
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.



Modified:
    httpd/httpd/trunk/modules/core/mod_so.c

Modified: httpd/httpd/trunk/modules/core/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_so.c?rev=1880461&r1=1880460&r2=1880461&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_so.c (original)
+++ httpd/httpd/trunk/modules/core/mod_so.c Fri Jul 31 01:21:25 2020
@@ -159,7 +159,7 @@ static const char *dso_load(cmd_parms *c
                             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) {