You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/01/23 22:22:30 UTC
cvs commit: xml-xerces/c/src/internal XMLScanner.cpp
tng 02/01/23 13:22:29
Modified: c/src/internal XMLScanner.cpp
Log:
[Bug 5545 ] Progressive Parse trashes when encountering "<! ... "
Revision Changes Path
1.82 +21 -20 xml-xerces/c/src/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- XMLScanner.cpp 17 Dec 2001 15:38:58 -0000 1.81
+++ XMLScanner.cpp 23 Jan 2002 21:22:29 -0000 1.82
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner.cpp,v 1.81 2001/12/17 15:38:58 knoaman Exp $
+ * $Id: XMLScanner.cpp,v 1.82 2002/01/23 21:22:29 tng Exp $
*/
@@ -735,31 +735,32 @@
unsigned int orgReader;
XMLTokens curToken;
- //
- // We have to handle any end of entity exceptions that happen here.
- // We could be at the end of X nested entities, each of which will
- // generate an end of entity exception as we try to move forward.
- //
+ bool retVal = true;
- while (true)
+ try
{
- try
+ while (true)
{
- curToken = senseNextToken(orgReader);
- break;
- }
+ //
+ // We have to handle any end of entity exceptions that happen here.
+ // We could be at the end of X nested entities, each of which will
+ // generate an end of entity exception as we try to move forward.
+ //
- catch(const EndOfEntityException& toCatch)
- {
- // Send an end of entity reference event
- if (fDocHandler)
- fDocHandler->endEntityReference(toCatch.getEntity());
+ try
+ {
+ curToken = senseNextToken(orgReader);
+ break;
+ }
+
+ catch(const EndOfEntityException& toCatch)
+ {
+ // Send an end of entity reference event
+ if (fDocHandler)
+ fDocHandler->endEntityReference(toCatch.getEntity());
+ }
}
- }
- bool retVal = true;
- try
- {
if (curToken == Token_CharData)
{
scanCharData(fCDataBuf);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org