Author: mrglavas
Date: Mon Jan 17 05:32:10 2022
New Revision: 1897143
URL: http://svn.apache.org/viewvc?rev=1897143&view=rev
Log:
Adding a required boundary check when a carriage return is the last character
of an entity.
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=1897143&r1=1897142&r2=1897143&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 05:32:10 2022
@@ -108,9 +108,11 @@ public class XML11EntityScanner
load(1, false);
}
if (c == '\r' && external) {
- int cc = fCurrentEntity.ch[fCurrentEntity.position++];
- if (cc != '\n' && cc != 0x85) {
- fCurrentEntity.position--;
+ if (fCurrentEntity.position < fCurrentEntity.count) {
+ int cc = fCurrentEntity.ch[fCurrentEntity.position++];
+ if (cc != '\n' && cc != 0x85) {
+ fCurrentEntity.position--;
+ }
}
}
c = '\n';
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=1897143&r1=1897142&r2=1897143&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 05:32:10 2022
@@ -257,8 +257,10 @@ public class XMLEntityScanner implements
load(1, false);
}
if (c == '\r' && external) {
- if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
- fCurrentEntity.position--;
+ if (fCurrentEntity.position < fCurrentEntity.count) {
+ if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
+ fCurrentEntity.position--;
+ }
}
c = '\n';
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
