elena 2003/07/25 12:50:02
Modified: java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
XMLScanner.java
Log:
Fixing a possible NPE exception in the case QName is invalid.
Revision Changes Path
1.44 +4 -2
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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XMLDTDScannerImpl.java 6 Jun 2003 13:32:23 -0000 1.43
+++ XMLDTDScannerImpl.java 25 Jul 2003 19:50:02 -0000 1.44
@@ -1488,7 +1488,9 @@
fEntityScanner.scanChar();
XMLStringBuffer colonName = new XMLStringBuffer(name);
colonName.append(":");
- colonName.append(fEntityScanner.scanName());
+ String str = fEntityScanner.scanName();
+ if (str != null)
+ colonName.append(str);
reportFatalError("ColonNotLegalWithNS", new Object[]
{colonName.toString()});
if (!skipSeparator(true, !scanningInternalSubset())) {
reportFatalError("MSG_SPACE_REQUIRED_AFTER_ENTITY_NAME_IN_ENTITYDECL",
1.36 +4 -2 xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XMLScanner.java 25 Jul 2003 19:41:10 -0000 1.35
+++ XMLScanner.java 25 Jul 2003 19:50:02 -0000 1.36
@@ -664,7 +664,9 @@
fEntityScanner.scanChar();
XMLStringBuffer colonName = new XMLStringBuffer(target);
colonName.append(":");
- colonName.append(fEntityScanner.scanName());
+ String str = fEntityScanner.scanName();
+ if (str != null)
+ colonName.append(str);
reportFatalError("ColonNotLegalWithNS", new Object[]
{colonName.toString()});
fEntityScanner.skipSpaces();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
