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

Reviewed-by: aivanov, prr, psadhukhan

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

@@ -391,6 +391,12 @@ public class JPEGImageReader extends ImageReader {
         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 @@ public class JPEGImageReader extends ImageReader {
         if (iis == null) {
             throw new IllegalStateException("Input not set");
         }
-        if (imageIndex < minIndex) {
-            throw new IndexOutOfBoundsException();
-        }
+        verifyImageIndex(imageIndex);
         if (!tablesOnlyChecked) {
             checkTablesOnly();
         }
@@ -842,6 +846,7 @@ public class JPEGImageReader extends ImageReader {
     public int getWidth(int imageIndex) throws IOException {
         setThreadLock();
         try {
+            verifyImageIndex(imageIndex);
             if (currentImage != imageIndex) {
                 cbLock.check();
                 readHeader(imageIndex, true);
@@ -856,6 +861,7 @@ public class JPEGImageReader extends ImageReader {
     public int getHeight(int imageIndex) throws IOException {
         setThreadLock();
         try {
+            verifyImageIndex(imageIndex);
             if (currentImage != imageIndex) {
                 cbLock.check();
                 readHeader(imageIndex, true);
@@ -886,6 +892,7 @@ public class JPEGImageReader extends ImageReader {
         throws IOException {
         setThreadLock();
         try {
+            verifyImageIndex(imageIndex);
             if (currentImage != imageIndex) {
                 cbLock.check();
 
@@ -904,6 +911,7 @@ public class JPEGImageReader extends ImageReader {
         throws IOException {
         setThreadLock();
         try {
+            verifyImageIndex(imageIndex);
             return getImageTypesOnThread(imageIndex);
         } finally {
             clearThreadLock();

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

@@ -0,0 +1,85 @@
+/*
+ * 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.concurrent.Callable;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+
+public class JpegNegativeImageIndexTest {
+
+    private static boolean failed;
+
+    private static void checkException(boolean exceptionReceived,
+                                       String testName) {
+        if (!exceptionReceived) {
+            System.out.println("Didn't receive IndexOutOfBoundsException for "
+                + testName);
+            failed = true;
+        }
+    }
+
+    private static void testMethod(String methodName,
+                                   Callable<?> method) {
+        boolean exceptionReceived = false;
+        System.out.println("Testing " + methodName);
+        try {
+            method.call();
+        } catch (Exception e) {
+            if (e instanceof IndexOutOfBoundsException) {
+                exceptionReceived = true;
+            }
+        }
+        checkException(exceptionReceived, methodName);
+    }
+
+    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();
+
+        testMethod("getImageTypes()", () -> ir.getImageTypes(-1));
+        testMethod("getWidth()", () -> ir.getWidth(-1));
+        testMethod("getHeight()", () -> ir.getHeight(-1));
+        testMethod("getRawImageType()", () -> ir.getRawImageType(-1));
+
+        if (failed) {
+            throw new RuntimeException("JpegImageReader didn't throw required" +
+                " IndexOutOfBoundsException for -1 image index");
+        }
+    }
+}