mrglavas 2004/01/05 13:54:18
Modified: java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
Log:
Fixing an edge case. We should reject PIs at the start of an entity
whose targets are of the form 'xml:foo' when namespace support
is enabled.
Revision Changes Path
1.46 +12 -5
xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
Index: XMLDTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XMLDTDScannerImpl.java 23 Sep 2003 21:42:31 -0000 1.45
+++ XMLDTDScannerImpl.java 5 Jan 2004 21:54:17 -0000 1.46
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2003 The Apache Software Foundation.
+ * Copyright (c) 1999-2004 The Apache Software Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -712,9 +712,16 @@
// whose name starts with "xml" (e.g. "xmlfoo")
if (isValidNameChar(fEntityScanner.peekChar())) {
fStringBuffer.clear();
- fStringBuffer.append("xml");
- while (isValidNameChar(fEntityScanner.peekChar())) {
- fStringBuffer.append((char)fEntityScanner.scanChar());
+ fStringBuffer.append("xml");
+ if (fNamespaces) {
+ while (isValidNCName(fEntityScanner.peekChar())) {
+ fStringBuffer.append((char)fEntityScanner.scanChar());
+ }
+ }
+ else {
+ while (isValidNameChar(fEntityScanner.peekChar())) {
+ fStringBuffer.append((char)fEntityScanner.scanChar());
+ }
}
String target =
fSymbolTable.addSymbol(fStringBuffer.ch,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
