Changed to allow aborting a suspended parser instance.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 7e124898bcfe1347f11812de35e892f8101f0b74..d6e06d1694dcdc979fdddbe68e1e2575195161ab 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -829,8 +829,9 @@ XMLPARSEAPI(enum XML_Status)
 XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
 
 /* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return.
-   Must be called from within a call-back handler. Some call-backs
-   may still follow because they would otherwise get lost. Examples:
+   Must be called from within a call-back handler, except when aborting
+   (resumable = 0) an already suspended parser. Some call-backs may
+   still follow because they would otherwise get lost. Examples:
    - endElementHandler() for empty elements when stopped in
      startElementHandler(), 
    - endNameSpaceDeclHandler() when stopped in endElementHandler(), 
@@ -840,8 +841,8 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
    except when parsing an external parameter entity and resumable != 0.
    Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise.
    Possible error codes: 
-   - XML_ERROR_SUSPENDED:  when the parser is already suspended.
-   - XML_ERROR_FINISHED:   when the parser has already finished.
+   - XML_ERROR_SUSPENDED: when suspending an already suspended parser.
+   - XML_ERROR_FINISHED: when the parser has already finished.
    - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE.
 
    When resumable != 0 (true) then parsing is suspended, that is, 

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 2d84ea046577fe1eacbd23d3ac16aa4711ed9388..01542e1068606de875d48b4a851ce447f45eeea6 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1668,8 +1668,12 @@ XML_StopParser(XML_Parser parser, XML_Bool resumable)
 {
   switch (parsing) {
   case XML_SUSPENDED:
-    errorCode = XML_ERROR_SUSPENDED;
-    return XML_STATUS_ERROR;
+    if (resumable) {
+      errorCode = XML_ERROR_SUSPENDED;
+      return XML_STATUS_ERROR;
+    }
+    parsing = XML_FINISHED;
+    break;
   case XML_FINISHED:
     errorCode = XML_ERROR_FINISHED;
     return XML_STATUS_ERROR;