[libxml2] Fix for conditional sections at end of document



commit c1035664f989c2ac7ca31407bc6f0b48396db42c
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Wed Oct 23 11:40:34 2019 +0200

    Fix for conditional sections at end of document
    
    Parsing conditional sections would fail if the final ']]>' was at the
    end of the document. Short-lived regression caused by commit c51e38cb.

 parser.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/parser.c b/parser.c
index 8a19cde3..43d0c688 100644
--- a/parser.c
+++ b/parser.c
@@ -6729,6 +6729,9 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
                 ctxt->disableSAX = state;
                 ctxt->instate = instate;
 
+               if (RAW == 0) {
+                   xmlFatalErr(ctxt, XML_ERR_CONDSEC_NOT_FINISHED, NULL);
+               }
                 if (ctxt->input->id != id) {
                     xmlFatalErrMsg(ctxt, XML_ERR_ENTITY_BOUNDARY,
                                    "All markup of the conditional section is"
@@ -6769,10 +6772,6 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
         GROW;
     }
 
-    if (RAW == 0) {
-       xmlFatalErr(ctxt, XML_ERR_CONDSEC_NOT_FINISHED, NULL);
-    }
-
 error:
     xmlFree(inputIds);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]