commit df8427c32484dcdec25618cb6537c7280acad0fa
author Raph Levien <raph@google.com> Fri Jun 06 20:15:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 06 20:15:27 2014 +0000
tree 47b1698a22f4274d64350331634658c19321e90b
parent 8a17910f81a75dfd395344dfcc548a489f212e45
parent 8d2aa199774f50256617351bf9caaaef59d47c59

Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches"

core/java/android/text/TextUtils.java

diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index f06ae71..48122d6 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -48,10 +48,11 @@
 import android.text.style.UnderlineSpan;
 import android.util.Log;
 import android.util.Printer;
-
 import android.view.View;
+
 import com.android.internal.R;
 import com.android.internal.util.ArrayUtils;
+
 import libcore.icu.ICU;
 
 import java.lang.reflect.Array;
@@ -229,7 +230,12 @@
     public static boolean regionMatches(CharSequence one, int toffset,
                                         CharSequence two, int ooffset,
                                         int len) {
-        char[] temp = obtain(2 * len);
+        int tempLen = 2 * len;
+        if (tempLen < len) {
+            // Integer overflow; len is unreasonably large
+            throw new IndexOutOfBoundsException();
+        }
+        char[] temp = obtain(tempLen);
 
         getChars(one, toffset, toffset + len, temp, 0);
         getChars(two, ooffset, ooffset + len, temp, len);