Author: mrglavas
Date: Mon Jan 17 20:50:35 2022
New Revision: 1897160
URL: http://svn.apache.org/viewvc?rev=1897160&view=rev
Log:
Treat carriage return as a regular content character within internal entities.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java?rev=1897160&r1=1897159&r2=1897160&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XML11EntityScanner.java
Mon Jan 17 20:50:35 2022
@@ -970,7 +970,7 @@ public class XML11EntityScanner
c = fCurrentEntity.ch[fCurrentEntity.position++];
// In internal entities control characters are allowed to
appear unescaped.
if ((c == quote && !fCurrentEntity.literal)
- || c == '%' || !XML11Char.isXML11InternalEntityContent(c))
{
+ || c == '%' || !(XML11Char.isXML11InternalEntityContent(c)
|| c == '\r' )) {
fCurrentEntity.position--;
break;
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java?rev=1897160&r1=1897159&r2=1897160&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/XMLEntityScanner.java
Mon Jan 17 20:50:35 2022
@@ -906,7 +906,7 @@ public class XMLEntityScanner implements
c = fCurrentEntity.ch[fCurrentEntity.position++];
if ((c == quote &&
(!fCurrentEntity.literal || external))
- || c == '%' || !XMLChar.isContent(c)) {
+ || c == '%' || !(XMLChar.isContent(c) || c == '\r' &&
!external)) {
fCurrentEntity.position--;
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
