]> granicus.if.org Git - apache/commitdiff
Guys... please be _careful_ when you pcalloc -> palloc!!!
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 19 Oct 2001 02:05:48 +0000 (02:05 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 19 Oct 2001 02:05:48 +0000 (02:05 +0000)
  Resolves GAmes' segfault observations

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

server/core.c

index 9fa1b8deeb6ab320896b520fc5468b8bcd1bb48f..56a421ca2578394a435e58e7186f026627f3f687 100644 (file)
@@ -183,7 +183,9 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
        memcpy(conf->response_code_strings, base->response_code_strings,
               sizeof(*conf->response_code_strings) * RESPONSE_CODES);
     }
-    
+    else
+        base->response_code_strings = NULL;
+
     conf->d = new->d;
     conf->d_is_fnmatch = new->d_is_fnmatch;
     conf->d_components = new->d_components;