From: Greg Stein <gstein@apache.org>
Date: Sat, 6 Oct 2001 17:02:59 +0000 (+0000)
Subject: Don't attempt to call apr_xml_parser_done() twice -- just exit when we have
X-Git-Tag: 2.0.26~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8d19a10ac6f2c8ccf8254507974b37b3f582c52;p=apache

Don't attempt to call apr_xml_parser_done() twice -- just exit when we have
a problem terminating the parser. _geterror() cannot be called either.


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

diff --git a/server/util_xml.c b/server/util_xml.c
index 9c617b298c..c7ab9c75fd 100644
--- a/server/util_xml.c
+++ b/server/util_xml.c
@@ -113,8 +113,11 @@ AP_DECLARE(int) ap_xml_parse_input(request_rec * r, apr_xml_doc **pdoc)
 
     /* tell the parser that we're done */
     status = apr_xml_parser_done(parser, pdoc);
-    if (status)
-        goto parser_error;
+    if (status) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
+                      "XML parser error (at end). status=%d", status);
+        return HTTP_BAD_REQUEST;
+    }
 
     return OK;