# HG changeset patch
# User aefimov
# Date 1433944057 -10800
# Node ID 3cc8e02e66bc361c2076580a71499ce2ddc63caa
# Parent  e3e97df49dcbaed33b74ab5ffd3241c0983000c5
7156085, PR2674: ArrayIndexOutOfBoundsException throws in UTF8Reader of SAXParser
Summary: improve support for supplementary characters
Reviewed-by: joehw

diff -r e3e97df49dcb -r 3cc8e02e66bc src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java	Sun May 31 18:54:58 2015 +0300
+++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java	Wed Jun 10 16:47:37 2015 +0300
@@ -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) {