Commit 6f7b1c50 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

v2 of sterlings segv fix 

always initialize the extension_info hash rather than checking that it is
!= NULL
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@90510 13f79535-47bb-0310-9956-ffa450edef68
parent 538ac36f

modules/http/mod_mime.c

+3 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void *create_mime_dir_config(apr_pool_t *p, char *dummy) 
    mime_dir_config *new =

    (mime_dir_config *) apr_palloc(p, sizeof(mime_dir_config));



    new->extension_mappings = NULL;

    new->extension_mappings = apr_hash_make(p);



    new->charsets_remove = NULL;

    new->encodings_remove = NULL;
@@ -827,10 +827,8 @@ static int find_ct(request_rec *r) 
        ap_str_tolower(ext);

#endif



        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,