8306461: ObjectInputStream::readObject() should handle negative array sizes without throwing NegativeArraySizeExceptions

src/java.base/share/classes/java/io/ObjectInputStream.java

@@ -1423,16 +1423,16 @@ private void filterCheck(Class<?> clazz, int arrayLength)
      * @param arrayLength the array length
      * @throws NullPointerException if arrayType is null
      * @throws IllegalArgumentException if arrayType isn't actually an array type
-     * @throws NegativeArraySizeException if arrayLength is negative
+     * @throws StreamCorruptedException if arrayLength is negative
      * @throws InvalidClassException if the filter rejects creation
      */
-    private void checkArray(Class<?> arrayType, int arrayLength) throws InvalidClassException {
+    private void checkArray(Class<?> arrayType, int arrayLength) throws ObjectStreamException {
         if (! arrayType.isArray()) {
             throw new IllegalArgumentException("not an array type");
         }
 
         if (arrayLength < 0) {
-            throw new NegativeArraySizeException();
+            throw new StreamCorruptedException("Array length is negative");
         }
 
         filterCheck(arrayType, arrayLength);
@@ -2111,7 +2111,9 @@ private Object readArray(boolean unshared) throws IOException {
 
         ObjectStreamClass desc = readClassDesc(false);
         int len = bin.readInt();
-
+        if (len < 0) {
+            throw new StreamCorruptedException("Array length is negative");
+        }
         filterCheck(desc.forClass(), len);
 
         Object array = null;

src/java.base/share/classes/jdk/internal/access/JavaObjectInputStreamAccess.java

@@ -25,7 +25,7 @@
 
 package jdk.internal.access;
 
-import java.io.InvalidClassException;
+import java.io.ObjectStreamException;
 import java.io.ObjectInputStream;
 
 /**
@@ -34,5 +34,5 @@
 @FunctionalInterface
 public interface JavaObjectInputStreamAccess {
     void checkArray(ObjectInputStream ois, Class<?> arrayType, int arrayLength)
-        throws InvalidClassException;
+        throws ObjectStreamException;
 }

test/jdk/java/io/ObjectInputStream/NegativeArraySizeTest.java

@@ -0,0 +1,147 @@
+/*
+ * Copyright Amazon.com Inc. 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 8306461
+ * @summary ObjectInputStream::readObject() should handle negative array sizes without throwing NegativeArraySizeExceptions
+ * @run main/othervm NegativeArraySizeTest
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InvalidClassException;
+import java.io.IOException;
+import java.io.ObjectInputFilter;
+import java.io.ObjectInputFilter.Status;
+import java.util.PriorityQueue;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
+
+public class NegativeArraySizeTest {
+
+    private static byte[] buildArrayPayload() throws IOException {
+        // Serialize to bytes
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        oos.writeObject(new String[1]);
+        oos.close();
+        byte[] serializedData = baos.toByteArray();
+
+        // Find the right location to modify, looking for the first instance of TC_ENDBLOCKDATA
+        int firstPos = 0;
+        for (int i = 0; i < serializedData.length - 1; i++) {
+            // 0x78 = TC_ENDBLOCKDATA
+            if (serializedData[i] == 0x78) {
+                // Replace array length with -2
+                serializedData[i + 2] = (byte) 0xff;
+                serializedData[i + 3] = (byte) 0xff;
+                serializedData[i + 4] = (byte) 0xff;
+                serializedData[i + 5] = (byte) 0xfe;
+
+                return serializedData;
+            }
+        }
+        throw new RuntimeException("Can't find TC_ENDBLOCKDATA in object output stream");
+    }
+
+    private static byte[] buildPriorityQueuePayload() throws IOException {
+        // Serialize to bytes
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(baos);
+        oos.writeObject(new PriorityQueue<>());
+        oos.close();
+        byte[] serializedData = baos.toByteArray();
+
+        // Find the right location to modify, looking for the first instance of TC_BLOCKDATA
+        int firstPos = 0;
+        for (int i = 0; i < serializedData.length - 1; i++) {
+            // 0x77 = TC_BLOCKDATA
+            if (serializedData[i] == 0x77) {
+                // Replace array length with -3
+                serializedData[i - 5] = (byte) 0xff;
+                serializedData[i - 4] = (byte) 0xff;
+                serializedData[i - 3] = (byte) 0xff;
+                serializedData[i - 2] = (byte) 0xfd;
+
+                return serializedData;
+            }
+        }
+        throw new RuntimeException("Can't find TC_BLOCKDATA in object output stream");
+    }
+
+    private static class CustomFilter implements ObjectInputFilter {
+        @Override
+        public Status checkInput(FilterInfo filterInfo) {
+            Class<?> cl = filterInfo.serialClass();
+            if (cl != null && cl.isArray() && filterInfo.arrayLength() < -1) {
+                throw new RuntimeException("FilterInfo.arrayLength() must be >= -1 for arrays (was " + filterInfo.arrayLength() + ")");
+            }
+            return Status.ALLOWED;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Test object input stream with negative sized array
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(buildArrayPayload());
+             ObjectInputStream ois = new ObjectInputStream(bais)) {
+            ois.readObject();
+        } catch (NegativeArraySizeException nase) {
+            throw new Exception("ObjectInputStream::readObject() shouldn't throw a NegativeArraySizeException", nase);
+        } catch (ObjectStreamException ose) {
+            // OK, because a NegativeArraySizeException should be converted into an ObjectStreamException
+            if (!"Array length is negative".equals(ose.getMessage())) {
+                throw new Exception("Expected \"Array length is negative\" as exception message", ose);
+            }
+        }
+        // Test object input stream with negative sized array and custom object input filter
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(buildArrayPayload());
+             ObjectInputStream ois = new ObjectInputStream(bais)) {
+            ois.setObjectInputFilter(new CustomFilter());
+            ois.readObject();
+        } catch (NegativeArraySizeException nase) {
+            throw new Exception("ObjectInputStream::readObject() shouldn't throw a NegativeArraySizeException", nase);
+        } catch (ObjectStreamException ose) {
+            if (ose instanceof InvalidClassException ice && ice.getMessage().contains("filter status: REJECTED")) {
+                throw new Exception("ObjectInputStream::readObject() should catch NegativeArraySizeExceptions before filtering", ice);
+            }
+            // OK, because a NegativeArraySizeException should be converted into an ObjectStreamException *before* filtering
+            if (!"Array length is negative".equals(ose.getMessage())) {
+                throw new Exception("Expected \"Array length is negative\" as exception message", ose);
+            }
+        }
+        // Test object input stream with negative sized PriorityQueue
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(buildPriorityQueuePayload());
+             ObjectInputStream ois = new ObjectInputStream(bais)) {
+            ois.readObject();
+        } catch (NegativeArraySizeException nase) {
+            throw new Exception("ObjectInputStream::readObject() shouldn't throw a NegativeArraySizeException", nase);
+        } catch (ObjectStreamException ose) {
+            // OK, because a NegativeArraySizeException should be converted into an ObjectStreamException
+            if (!"Array length is negative".equals(ose.getMessage())) {
+                throw new Exception("Expected \"Array length is negative\" as exception message", ose);
+            }
+        }
+    }
+}