# HG changeset patch # User jdv # Date 1476689673 -19800 # Node ID 1c7a96e0ff00cb8ff7d799e0ad61b1112aa48596 # Parent 941a82f69e9155670d30de2751b07bb99ae79c83 8167281: IIOMetadataNode bugs in getElementsByTagName and NodeList.item methods Reviewed-by: prr, pnarayanan, sgehwolf diff -r 941a82f69e91 -r 1c7a96e0ff00 src/share/classes/javax/imageio/metadata/IIOMetadataNode.java --- a/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java Tue Nov 06 10:10:18 2018 -0800 +++ b/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java Mon Oct 17 13:04:33 2016 +0530 @@ -121,7 +121,7 @@ } public Node item(int index) { - if (index < 0 || index > nodes.size()) { + if (index < 0 || index >= nodes.size()) { return null; } return (Node)nodes.get(index); @@ -878,7 +878,7 @@ } private void getElementsByTagName(String name, List l) { - if (nodeName.equals(name)) { + if (nodeName.equals(name) || "*".equals(name)) { l.add(this); } diff -r 941a82f69e91 -r 1c7a96e0ff00 test/javax/imageio/metadata/GetElementsByTagNameTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/imageio/metadata/GetElementsByTagNameTest.java Mon Oct 17 13:04:33 2016 +0530 @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8167281 + * @summary Test verifies that Element.getElementsByTagName("*") is not empty + * for valid image. + * @run main GetElementsByTagNameTest + */ + +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.metadata.IIOMetadata; +import javax.imageio.metadata.IIOMetadataFormatImpl; +import javax.imageio.stream.ImageInputStream; +import javax.imageio.stream.MemoryCacheImageInputStream; +import org.w3c.dom.Element; + +public class GetElementsByTagNameTest { + + public static void main(String[] args) throws IOException { + // Generate some trivial image and save it to a temporary array + ByteArrayOutputStream tmp = new ByteArrayOutputStream(); + ImageIO.write(new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB), + "gif", tmp); + + // Read the stream + ImageInputStream in = new MemoryCacheImageInputStream( + new ByteArrayInputStream(tmp.toByteArray())); + ImageReader reader = ImageIO.getImageReaders(in).next(); + reader.setInput(in); + + // Retrieve standard image metadata tree + IIOMetadata meta = reader.getImageMetadata(0); + if (meta == null || !meta.isStandardMetadataFormatSupported()) { + throw new Error("Test failure: Missing metadata"); + } + Element root = (Element) meta. + getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName); + + // Test getElementsByTagName("*") + if (root.getElementsByTagName("*").getLength() == 0) { + throw new RuntimeException("getElementsByTagName(\"*\") returns" + + " nothing"); + } + } +} + diff -r 941a82f69e91 -r 1c7a96e0ff00 test/javax/imageio/metadata/NthItemNodeListTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/imageio/metadata/NthItemNodeListTest.java Mon Oct 17 13:04:33 2016 +0530 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8167281 + * @summary Test verifies that accessing nth item in NodeList doesn't throw + * IndexOutOfBoundsException. + * @run main NthItemNodeListTest + */ + +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.metadata.IIOMetadata; +import javax.imageio.metadata.IIOMetadataFormatImpl; +import javax.imageio.stream.ImageInputStream; +import javax.imageio.stream.MemoryCacheImageInputStream; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class NthItemNodeListTest { + + public static void main(String[] args) throws IOException { + // Generate some trivial image and save it to a temporary array + ByteArrayOutputStream tmp = new ByteArrayOutputStream(); + ImageIO.write(new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB), + "gif", tmp); + + // Read it back in + ImageInputStream in = new MemoryCacheImageInputStream( + new ByteArrayInputStream(tmp.toByteArray())); + ImageReader reader = ImageIO.getImageReaders(in).next(); + reader.setInput(in); + + // Retrieve standard image metadata tree + IIOMetadata meta = reader.getImageMetadata(0); + if (meta == null || !meta.isStandardMetadataFormatSupported()) { + throw new Error("Test failure: Missing metadata"); + } + Element root = (Element) meta. + getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName); + + NodeList nodeList = root. + getElementsByTagName(root.getFirstChild().getNodeName()); + /* + * Accessing the nth node should return null and not throw + * IndexOutOfBoundsException. + */ + Node n = (nodeList.item(nodeList.getLength())); + } +} +