8286533: Key X509 usages

Reviewed-by: mbalao, andrew Backport-of: c2a13eef3642987386db1b4759507e30796c0acc
openjdk · Oct 10, 2022 · e09162a · e09162a
1 parent 62b1b3e
commit e09162a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/jdk/src/share/classes/sun/security/util/DerInputStream.java b/jdk/src/share/classes/sun/security/util/DerInputStream.java
@@ -272,6 +272,9 @@ public byte[] getOctetString() throws IOException {
             throw new IOException("DER input not an octet string");
 
         int length = getDefiniteLength(buffer);
+        if (length > buffer.available())
+            throw new IOException("short read of an octet string");
+
         byte[] retval = new byte[length];
         if ((length != 0) && (buffer.read(retval) != length))
             throw new IOException("Short read of DER octet string");
@@ -497,6 +500,10 @@ private String readString(byte stringTag, String stringName,
                                   stringName + " string");
 
         int length = getDefiniteLength(buffer);
+        if (length > buffer.available())
+            throw new IOException("short read of " +
+                                  stringName + " string");
+
         byte[] retval = new byte[length];
         if ((length != 0) && (buffer.read(retval) != length))
             throw new IOException("Short read of DER " +