8364135: JPEGImageReader.getImageTypes() should throw exception for negative image index

src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java

@@ -391,6 +391,12 @@ private void checkTablesOnly() throws IOException {
         tablesOnlyChecked = true;
     }
 
+    private void verifyImageIndex(int imageIndex) {
+        if (imageIndex < minIndex) {
+            throw new IndexOutOfBoundsException("imageIndex < " + minIndex);
+        }
+    }
+
     @Override
     public int getNumImages(boolean allowSearch) throws IOException {
         setThreadLock();
@@ -497,9 +503,7 @@ private void gotoImage(int imageIndex) throws IOException {
         if (iis == null) {
             throw new IllegalStateException("Input not set");
         }
-        if (imageIndex < minIndex) {
-            throw new IndexOutOfBoundsException();
-        }
+        verifyImageIndex(imageIndex);
         if (!tablesOnlyChecked) {
             checkTablesOnly();
         }
@@ -840,6 +844,7 @@ private void setImageData(int width,
 
     @Override
     public int getWidth(int imageIndex) throws IOException {
+        verifyImageIndex(imageIndex);
         setThreadLock();
         try {
             if (currentImage != imageIndex) {
@@ -854,6 +859,7 @@ public int getWidth(int imageIndex) throws IOException {
 
     @Override
     public int getHeight(int imageIndex) throws IOException {
+        verifyImageIndex(imageIndex);
         setThreadLock();
         try {
             if (currentImage != imageIndex) {
@@ -884,6 +890,7 @@ private ImageTypeProducer getImageType(int code) {
     @Override
     public ImageTypeSpecifier getRawImageType(int imageIndex)
         throws IOException {
+        verifyImageIndex(imageIndex);
         setThreadLock();
         try {
             if (currentImage != imageIndex) {
@@ -902,6 +909,7 @@ public ImageTypeSpecifier getRawImageType(int imageIndex)
     @Override
     public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex)
         throws IOException {
+        verifyImageIndex(imageIndex);
         setThreadLock();
         try {
             return getImageTypesOnThread(imageIndex);

test/jdk/javax/imageio/plugins/jpeg/JpegNegativeImageIndexTest.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025, 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     8364135
+ * @summary Test verifies that jpeg image reader throws
+ *          IndexOutOfBoundsException when "-1" image index is used.
+ * @run main JpegNegativeImageIndexTest
+ */
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Objects;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageTypeSpecifier;
+
+public class JpegNegativeImageIndexTest {
+
+    static boolean passed;
+
+    public static void main(String[] args) throws IOException {
+        Iterator<ImageReader> readers =
+            ImageIO.getImageReadersByFormatName("jpeg");
+        if (!readers.hasNext()) {
+            throw new RuntimeException("No jpeg image readers found");
+        }
+
+        ImageReader ir = readers.next();
+        try {
+            // Iterate through all functions where we don't have sufficient
+            // checks for -1 index
+            Iterator<ImageTypeSpecifier> types = ir.getImageTypes(-1);
+            int width = ir.getWidth(-1);
+            int height = ir.getHeight(-1);
+            ImageTypeSpecifier specifier = ir.getRawImageType(-1);
+        } catch (IndexOutOfBoundsException e) {
+            if (Objects.equals(e.getMessage(), "imageIndex < 0")) {
+                passed = true;
+            }
+        }
+        if (!passed) {
+            throw new RuntimeException("JpegImageReader didn't throw required"
+                + " IndexOutOfBoundsException for -1 image index");
+        }
+    }
+}