From kwaclaw at users.sourceforge.net  Tue Dec 29 19:42:07 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 29 Dec 2009 18:42:07 +0000
Subject: [Expat-checkins] expat/lib xmlparse.c,1.165,1.166
Message-ID: <E1NPh1D-0006SM-PI@sfp-cvsdas-1.v30.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/lib
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24798

Modified Files:
	xmlparse.c 
Log Message:
Revised fix for issue# 2894085: differentiated between two cases where the next pointer should be updated to the end pointer or not - the differentiating negative token value is -XML_TOK_PROLOG_S.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- xmlparse.c	27 Nov 2009 13:34:29 -0000	1.165
+++ xmlparse.c	29 Dec 2009 18:42:05 -0000	1.166
@@ -3701,6 +3701,9 @@
         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 @@
         return XML_ERROR_NO_ELEMENTS;
       default:
         tok = -tok;
+        next = end;
         break;
       }
     }