You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@apache.org on 2001/08/20 06:48:39 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
andyc 01/08/19 21:48:39
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLDTDScannerImpl.java
Log:
Fixed another infinite loop in DTD scanner when pull parsing
the external subset.
Revision Changes Path
No revision
No revision
1.1.2.3 +11 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScannerImpl.java
Index: XMLDTDScannerImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScannerImpl.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLDTDScannerImpl.java 2001/08/20 04:32:57 1.1.2.2
+++ XMLDTDScannerImpl.java 2001/08/20 04:48:39 1.1.2.3
@@ -87,7 +87,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDTDScannerImpl.java,v 1.1.2.2 2001/08/20 04:32:57 andyc Exp $
+ * @version $Id: XMLDTDScannerImpl.java,v 1.1.2.3 2001/08/20 04:48:39 andyc Exp $
*/
public class XMLDTDScannerImpl
extends XMLScanner
@@ -236,6 +236,7 @@
if (fScannerState == SCANNER_STATE_END_OF_INPUT) {
return false;
}
+ /***
else if (!more || !complete) {
return more;
}
@@ -244,6 +245,16 @@
// is a TextDecl or not
setScannerState(SCANNER_STATE_MARKUP_DECL);
}
+ /***/
+ else {
+ // next state is markup decls regardless of whether there
+ // is a TextDecl or not
+ setScannerState(SCANNER_STATE_MARKUP_DECL);
+ if (!more || !complete) {
+ return more;
+ }
+ }
+ /***/
}
// keep dispatching "events"
do {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org