You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2009/06/22 21:08:53 UTC

svn commit: r787352 - /xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java

Author: mrglavas
Date: Mon Jun 22 19:08:53 2009
New Revision: 787352

URL: http://svn.apache.org/viewvc?rev=787352&view=rev
Log:
Fixing a couple bugs. We were missing checks for surrogates and well-formedness when scanning system identifiers.

Modified:
    xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java

Modified: xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java?rev=787352&r1=787351&r2=787352&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/XMLScanner.java Mon Jun 22 19:08:53 2009
@@ -1027,6 +1027,14 @@
                     if (XMLChar.isMarkup(c) || c == ']') {
                         fStringBuffer.append((char)fEntityScanner.scanChar());
                     }
+                    else if (XMLChar.isHighSurrogate(c)) {
+                        scanSurrogates(fStringBuffer);
+                    }
+                    else if (isInvalidLiteral(c)) {
+                        reportFatalError("InvalidCharInSystemID",
+                                new Object[] { Integer.toHexString(c) }); 
+                        fEntityScanner.scanChar();
+                    }
                 } while (fEntityScanner.scanLiteral(quote, ident) != quote);
                 fStringBuffer.append(ident);
                 ident = fStringBuffer;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org