commit dedb5b5093fc53376b83846ce01865ec343ac369
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 02 11:32:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 02 11:32:19 2017 +0000
tree caa2b428c6fadcf4788344d446fc845067075b53
parent cfdae76c83c066dcff2e883c43bbc78749b5a94a
parent ccab03e564b86583fdffb0cecfa30336ec1c6a42

Merge "Port "Better ObjectIdentifier validation" change from openJdk8u121-b13"

ojluni/src/main/java/sun/security/util/ObjectIdentifier.java

diff --git a/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java b/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java
index 38d171a..58f26c3 100644
--- a/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java
+++ b/ojluni/src/main/java/sun/security/util/ObjectIdentifier.java
@@ -255,7 +255,13 @@
                 + " (tag = " +  type_id + ")"
                 );
 
-        encoding = new byte[in.getLength()];
+        int len = in.getLength();
+        if (len > in.available()) {
+            throw new IOException("ObjectIdentifier() -- length exceeds" +
+                    "data available.  Length: " + len + ", Available: " +
+                    in.available());
+        }
+        encoding = new byte[len];
         in.getBytes(encoding);
         check(encoding);
     }
@@ -354,6 +360,7 @@
      * @return components in an int array, if all the components are less than
      *         Integer.MAX_VALUE. Otherwise, null.
      */
+    // Android-changed: s/private/public: Needed to keep sort order of RDN from prev impl
     public int[] toIntArray() {
         int length = encoding.length;
         int[] result = new int[20];