diff options
| author | Jeff Trawick <trawick@apache.org> | 2010-08-20 22:47:35 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2010-08-20 22:47:35 +0200 |
| commit | 105ce3617b0caff1fe2a90415827e9f62694cdd0 (patch) | |
| tree | 932be2aec25de179ea1efdafe4ab62e17bfcf2c6 /server/config.c | |
| parent | remove useless check for current == NULL; if it is NULL, a (diff) | |
| download | apache2-105ce3617b0caff1fe2a90415827e9f62694cdd0.tar.xz apache2-105ce3617b0caff1fe2a90415827e9f62694cdd0.zip | |
follow up r987629 with another similar issue
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
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/config.c b/server/config.c index 0549782ff2..b58f096939 100644 --- a/server/config.c +++ b/server/config.c @@ -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; } |