]> granicus.if.org Git - apache/commitdiff
follow up r987629 with another similar issue
authorJeff Trawick <trawick@apache.org>
Fri, 20 Aug 2010 20:47:35 +0000 (20:47 +0000)
committerJeff Trawick <trawick@apache.org>
Fri, 20 Aug 2010 20:47:35 +0000 (20:47 +0000)
curr_parent can't be NULL (or we segfault elsewhere), so
don't check for NULL

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

server/config.c

index 0549782ff22d65f554bd7efc73ed43a9637b59ad..b58f096939281ae63755d49edb35438b5ac752ce 100644 (file)
@@ -1182,7 +1182,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
         if (retval != NULL)
             return retval;
 
-        if (sub_tree == NULL && curr_parent != NULL) {
+        if (sub_tree == NULL) {
             sub_tree = *curr_parent;
         }