From: Andre Malo <nd@apache.org>
Date: Sat, 15 Feb 2003 04:57:10 +0000 (+0000)
Subject: fill out parms->err_directive while looking for open parents.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b051e6a2a46cfe9fd9875ee09e049b313615cb5;p=thirdparty%2Fapache%2Fhttpd.git

fill out parms->err_directive while looking for open parents.
Otherwise when trying to log the error
(a) we segfault (if the directive was in another file)
(b) we show a wrong occurrence line number (start line of the previous
    container) or probably segfault, too (if no previous container exists).

PR: 17093


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

diff --git a/server/config.c b/server/config.c
index d225505f958..2e2b06b3874 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1170,7 +1170,9 @@ AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
                                   curr_parent->filename,
                                   curr_parent->line_num,
                                   curr_parent->directive);
-                                  curr_parent = curr_parent->parent;
+
+            parms->err_directive = curr_parent;
+            curr_parent = curr_parent->parent;
         }
 
         return errmsg;