You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ro...@locus.apache.org on 2000/01/28 00:20:34 UTC
cvs commit: xml-xerces/c/src/internal XMLScanner2.cpp
roddey 00/01/27 15:20:34
Modified: c/src/internal XMLScanner2.cpp
Log:
If an entity ends on the last > of some markup, then the end of entity
won't be sent because the end of entity is not sensed.
Revision Changes Path
1.8 +11 -2 xml-xerces/c/src/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLScanner2.cpp 2000/01/25 01:04:21 1.7
+++ XMLScanner2.cpp 2000/01/27 23:20:33 1.8
@@ -56,6 +56,10 @@
/**
* $Log: XMLScanner2.cpp,v $
+ * Revision 1.8 2000/01/27 23:20:33 roddey
+ * If an entity ends on the last > of some markup, then the end of entity
+ * won't be sent because the end of entity is not sensed.
+ *
* Revision 1.7 2000/01/25 01:04:21 roddey
* Fixes a bogus error about ]]> in char data.
*
@@ -882,9 +886,15 @@
{
//
// Get the next character and use it to guesstimate what the next token
- // is going to be.
+ // is going to be. We turn on end of entity exceptions when we do this
+ // in order to catch the scenario where the current entity ended at
+ // the > of some markup.
//
- XMLCh nextCh = fReaderMgr.peekNextChar();
+ XMLCh nextCh;
+ {
+ ThrowEOEJanitor janMgr(&fReaderMgr, true);
+ nextCh = fReaderMgr.peekNextChar();
+ }
// If its not one of the special chars, then assume its char data
if (!XMLReader::isSpecialTokenSenseChar(nextCh))