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:32:58 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLDocumentScannerImpl.java XMLDTDScannerImpl.java
andyc 01/08/19 21:32:58
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLDocumentScannerImpl.java XMLDTDScannerImpl.java
Log:
Fix for infinite loop in DTD scanner when pull parsing.
Revision Changes Path
No revision
No revision
1.1.2.4 +1 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScannerImpl.java
Index: XMLDocumentScannerImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScannerImpl.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLDocumentScannerImpl.java 2001/08/17 10:01:55 1.1.2.3
+++ XMLDocumentScannerImpl.java 2001/08/20 04:32:57 1.1.2.4
@@ -104,7 +104,7 @@
* @author Arnaud Le Hors, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDocumentScannerImpl.java,v 1.1.2.3 2001/08/17 10:01:55 andyc Exp $
+ * @version $Id: XMLDocumentScannerImpl.java,v 1.1.2.4 2001/08/20 04:32:57 andyc Exp $
*/
public class XMLDocumentScannerImpl
extends XMLScanner
@@ -1693,7 +1693,6 @@
reportFatalError("EXPECTED_SQUARE_BRACKET_TO_CLOSE_INTERNAL_SUBSET",
null);
}
- fEntityScanner.skipSpaces();
fEntityScanner.skipSpaces();
if (!fEntityScanner.skipChar('>')) {
reportFatalError("DoctypedeclUnterminated", new Object[]{fDoctypeName});
1.1.2.2 +4 -2 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLDTDScannerImpl.java 2001/08/06 05:17:54 1.1.2.1
+++ XMLDTDScannerImpl.java 2001/08/20 04:32:57 1.1.2.2
@@ -87,7 +87,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDTDScannerImpl.java,v 1.1.2.1 2001/08/06 05:17:54 andyc Exp $
+ * @version $Id: XMLDTDScannerImpl.java,v 1.1.2.2 2001/08/20 04:32:57 andyc Exp $
*/
public class XMLDTDScannerImpl
extends XMLScanner
@@ -1696,7 +1696,9 @@
throws IOException, XNIException {
skipSeparator(false, true);
- while (complete && fScannerState == SCANNER_STATE_MARKUP_DECL) {
+ boolean again = true;
+ while (again && fScannerState == SCANNER_STATE_MARKUP_DECL) {
+ again = complete;
if (fEntityScanner.skipChar('<')) {
fMarkUpDepth++;
if (fEntityScanner.skipChar('?')) {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org