From: Jeff Trawick <trawick@apache.org>
Date: Fri, 20 Aug 2010 20:39:02 +0000 (+0000)
Subject: remove useless check for current == NULL; if it is NULL, a
X-Git-Tag: 2.3.8~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43ca6cc23903749f29fb5bc4ddad427f22d2bfc4;p=apache

remove useless check for current == NULL; if it is NULL, a
segfault will occur right before the function returns anyway
(IOW, caller must not pass in NULL for that arg)


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

diff --git a/server/config.c b/server/config.c
index 5f0ae48cdf..0549782ff2 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1186,7 +1186,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
             sub_tree = *curr_parent;
         }
 
-        if (sub_tree == NULL && current != NULL) {
+        if (sub_tree == NULL) {
             sub_tree = *current;
         }
     }