Mercurial > hg > jdk9-shenandoah > jaxp
changeset 658:f697052647e3
7156085: ArrayIndexOutOfBoundsException throws in UTF8Reader of SAXParser
Summary: improve support for supplementary characters
Reviewed-by: joehw
author | martin |
---|---|
date | Thu, 30 Oct 2014 07:24:51 -0700 |
parents | 48e4ec70cc1c |
children | 6c6b34477e93 |
files | src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java |
diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Thu Oct 23 13:45:30 2014 -0700 +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Thu Oct 30 07:24:51 2014 -0700 @@ -529,6 +529,16 @@ invalidByte(4, 4, b2); } + // check if output buffer is large enough to hold 2 surrogate chars + if (out + 1 >= ch.length) { + fBuffer[0] = (byte)b0; + fBuffer[1] = (byte)b1; + fBuffer[2] = (byte)b2; + fBuffer[3] = (byte)b3; + fOffset = 4; + return out - offset; + } + // decode bytes into surrogate characters int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003); if (uuuuu > 0x10) {