--- a/src/java.base/share/classes/java/io/ObjectInputStream.java	Thu Jun 15 09:57:15 2017 -0700
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java	Mon Jun 19 17:38:33 2017 -0400
@@ -1770,6 +1770,10 @@
         passHandle = NULL_HANDLE;
 
         int numIfaces = bin.readInt();
+        if (numIfaces > 65535) {
+            throw new InvalidObjectException("interface limit exceeded: "
+                    + numIfaces);
+        }
         String[] ifaces = new String[numIfaces];
         for (int i = 0; i < numIfaces; i++) {
             ifaces[i] = bin.readUTF();