Merge 068b9d5 into 8b9bf75

rivosinc · Jan 23, 2024 · 8337828 · 8337828
2 parents 8b9bf75 + 068b9d5
commit 8337828
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
@@ -1987,9 +1987,8 @@ private ObjectStreamClass readProxyDesc(boolean unshared)
             resolveEx = ex;
         } catch (IllegalAccessError aie) {
             throw new InvalidClassException(aie.getMessage(), aie);
-        } catch (OutOfMemoryError memerr) {
-            throw new InvalidObjectException("Proxy interface limit exceeded: " +
-                                             Arrays.toString(ifaces), memerr);
+        } catch (OutOfMemoryError oome) {
+            throw genInvalidObjectException(oome, ifaces);
         }
 
         // Call filterCheck on the class before reading anything else
@@ -2001,9 +2000,8 @@ private ObjectStreamClass readProxyDesc(boolean unshared)
             totalObjectRefs++;
             depth++;
             desc.initProxy(cl, resolveEx, readClassDesc(false));
-        } catch (OutOfMemoryError memerr) {
-            throw new InvalidObjectException("Proxy interface limit exceeded: " +
-                                             Arrays.toString(ifaces), memerr);
+        } catch (OutOfMemoryError oome) {
+            throw genInvalidObjectException(oome, ifaces);
         } finally {
             depth--;
         }
@@ -2013,6 +2011,13 @@ private ObjectStreamClass readProxyDesc(boolean unshared)
         return desc;
     }
 
+    // Generate an InvalidObjectException for an OutOfMemoryError
+    // Use String.concat() to avoid string formatting code generation
+    private static InvalidObjectException genInvalidObjectException(OutOfMemoryError oome, String[] ifaces) {
+        return new InvalidObjectException("Proxy interface limit exceeded: "
+                .concat(Arrays.toString(ifaces)), oome);
+    }
+
     /**
      * Reads in and returns class descriptor for a class that is not a dynamic
      * proxy class.  Sets passHandle to class descriptor's assigned handle.  If