Revised fix for issue# 2894085: differentiated between two cases where the next point...

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 72488d416039eae3b615c9c5bb22c7a6b97dc188..c766d40531c1f792ea35a97e79dec32f29e687d7 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -3701,6 +3701,9 @@ doProlog(XML_Parser parser,
         return XML_ERROR_UNCLOSED_TOKEN;
       case XML_TOK_PARTIAL_CHAR:
         return XML_ERROR_PARTIAL_CHAR;
+      case -XML_TOK_PROLOG_S:
+        tok = -tok;
+        break;
       case XML_TOK_NONE:
 #ifdef XML_DTD
         /* for internal PE NOT referenced between declarations */
@@ -3723,6 +3726,7 @@ doProlog(XML_Parser parser,
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
+        next = end;
         break;
       }
     }