/hg/icedtea7-forest/jaxp: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 834a39f903fd in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=834a39f903fd
author: aefimov
date: Mon May 11 12:48:57 2015 +0300

	8062518, PR2674: AIOBE occurs when accessing to document function in extended function in JAXP
	Reviewed-by: joehw


changeset e3e97df49dcb in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=e3e97df49dcb
author: aefimov
date: Sun May 31 18:54:58 2015 +0300

	8081392, PR2674: getNodeValue should return 'null' value for Element nodes
	Reviewed-by: joehw


changeset 3cc8e02e66bc in /hg/icedtea7-forest/jaxp
details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=3cc8e02e66bc
author: aefimov
date: Wed Jun 10 16:47:37 2015 +0300

	7156085, PR2674: ArrayIndexOutOfBoundsException throws in UTF8Reader of SAXParser
	Summary: improve support for supplementary characters
	Reviewed-by: joehw


diffstat:

 src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java     |   8 ++++++--
 src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java    |  10 ++++++++++
 src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java     |   2 +-
 src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java |   6 +-----
 4 files changed, 18 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r 64c8c98ba2af -r 3cc8e02e66bc src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java	Thu Oct 15 21:42:22 2015 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java	Wed Jun 10 16:47:37 2015 +0300
@@ -567,8 +567,12 @@
     }
 
     public NodeList makeNodeList(DTMAxisIterator iter) {
-        // TODO: gather nodes from all DOMs ?
-        return _main.makeNodeList(iter);
+        int index = iter.next();
+        if (index == DTM.NULL) {
+            return null;
+        }
+        iter.reset();
+        return _adapters[getDTMId(index)].makeNodeList(iter);
     }
 
     public String getLanguage(int node) {
diff -r 64c8c98ba2af -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	Thu Oct 15 21:42:22 2015 +0100
+++ 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) {
diff -r 64c8c98ba2af -r 3cc8e02e66bc src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Thu Oct 15 21:42:22 2015 +0100
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Wed Jun 10 16:47:37 2015 +0300
@@ -2116,7 +2116,7 @@
      */
     @Override
     public String getTextContent() throws DOMException {
-        return getNodeValue();  // overriden in some subclasses
+        return dtm.getStringValue(node).toString();
     }
 
      /**
diff -r 64c8c98ba2af -r 3cc8e02e66bc src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Thu Oct 15 21:42:22 2015 +0100
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Wed Jun 10 16:47:37 2015 +0300
@@ -3145,11 +3145,7 @@
                                   m_data.elementAt(-dataIndex+1));
       }
     }
-    else if (DTM.ELEMENT_NODE == type)
-    {
-      return getStringValueX(nodeHandle);
-    }
-    else if (DTM.DOCUMENT_FRAGMENT_NODE == type
+    else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
              || DTM.DOCUMENT_NODE == type)
     {
       return null;