diff options
| author | Eric Covener <covener@apache.org> | 2020-07-31 03:21:25 +0200 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2020-07-31 03:21:25 +0200 |
| commit | 7fafffc8aa18bbed18d7cefa10bea7ee8c3d4227 (patch) | |
| tree | e2883cea9477f4aecdfddc5f2e09f67fbccd40ac /modules/core | |
| parent | For non-trunk run a simpler APLOGNO() test using grep which (diff) | |
| download | apache2-7fafffc8aa18bbed18d7cefa10bea7ee8c3d4227.tar.xz apache2-7fafffc8aa18bbed18d7cefa10bea7ee8c3d4227.zip | |
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
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/mod_so.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c index 6eafbe9aea..f5d18c1740 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) { |