neilg 2003/07/25 10:23:51
Modified: java/src/org/apache/xerces/impl XML11EntityScanner.java
Log:
the fix to bug 18789 exposed another bug in the XML 1.1 implementation: For
comments and processing instructions, we permittted control characters to be present,
unescaped. This commit should resolve that bug.
Revision Changes Path
1.5 +3 -2
xml-xerces/java/src/org/apache/xerces/impl/XML11EntityScanner.java
Index: XML11EntityScanner.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11EntityScanner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XML11EntityScanner.java 5 Jun 2003 21:46:18 -0000 1.4
+++ XML11EntityScanner.java 25 Jul 2003 17:23:51 -0000 1.5
@@ -852,7 +852,8 @@
fCurrentEntity.position--;
break;
}
- else if (XML11Char.isXML11Invalid(c)) {
+ // note that we should not skip over control characters!
+ else if (!XML11Char.isXML11ValidLiteral(c)) {
fCurrentEntity.position--;
int length = fCurrentEntity.position - offset;
fCurrentEntity.columnNumber += length - newlines;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
