Mercurial > hg > icedtea8-forest > jaxp
changeset 1300:b3c914ad842d jdk8u76-b01
8133924: NPE may be thrown when xsltc select a non-existing node after JDK-8062518
Reviewed-by: joehw, coffeys
| author | aefimov |
|---|---|
| date | Sat, 05 Dec 2015 13:22:53 +0300 |
| parents | ed94049af050 |
| children | 7711933ec184 fd9d38e75287 |
| files | src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Mon Oct 26 13:21:53 2015 -0700 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Sat Dec 05 13:22:53 2015 +0300 @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: MultiDOM.java,v 1.5 2005/09/28 13:48:36 pvedula Exp $ - */ package com.sun.org.apache.xalan.internal.xsltc.dom; @@ -32,6 +29,7 @@ import com.sun.org.apache.xml.internal.dtm.DTMAxisIterator; import com.sun.org.apache.xml.internal.dtm.DTMManager; import com.sun.org.apache.xml.internal.dtm.ref.DTMAxisIteratorBase; +import com.sun.org.apache.xml.internal.dtm.ref.DTMAxisIterNodeList; import com.sun.org.apache.xml.internal.dtm.ref.DTMDefaultBase; import com.sun.org.apache.xml.internal.serializer.SerializationHandler; import com.sun.org.apache.xml.internal.utils.SuballocatedIntVector; @@ -569,7 +567,7 @@ public NodeList makeNodeList(DTMAxisIterator iter) { int index = iter.next(); if (index == DTM.NULL) { - return null; + return new DTMAxisIterNodeList(null, null); } iter.reset(); return _adapters[getDTMId(index)].makeNodeList(iter);