fix segv in mod_mime if no AddTypes are configured

PR:
Obtained from:
Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	dougm

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

diff --git a/CHANGES b/CHANGES
index 204999a9af73e24dcf42d9232b0ff4f6fdd93289..db694cd7a3deb1052ad997a717a8d089b554677d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 Changes with Apache 2.0.25-dev
+  *) fix segv in mod_mime if no AddTypes are configured
+     [John Sterling <sterling@covalent.net>]
+
   *) Enable ssl client authentication at SSL_accept time
      [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]
 

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 1863a77acd160d88f53be1a5b6f89430af3a664b..29ae4be42908422b9b59abf9b257914906ea564a 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -812,7 +812,7 @@ static int find_ct(request_rec *r)
     /* Parse filename extensions which can be in any order 
      */
     while (*fn && (ext = ap_getword(r->pool, &fn, '.'))) {
-        extension_info *exinfo;
+        extension_info *exinfo = NULL;
         int found;
 
         if (*ext == '\0')  /* ignore empty extensions "bad..html" */
@@ -827,9 +827,11 @@ static int find_ct(request_rec *r)
         ap_str_tolower(ext);
 #endif
 
-        exinfo = (extension_info*) apr_hash_get(conf->extension_mappings,
-                                                ext, APR_HASH_KEY_STRING);
-        
+        if (conf->extension_mappings != NULL) {
+            exinfo = (extension_info*)apr_hash_get(conf->extension_mappings,
+                                                   ext, APR_HASH_KEY_STRING);
+        }
+
         if (exinfo == NULL) {
             if ((type = apr_hash_get(mime_type_extensions, ext,
                                      APR_HASH_KEY_STRING)) != NULL) {