commit 931e3f689239f4b35a297031a100a11f1499c21c
author Narayan Kamath <narayan@google.com> Wed Jan 13 11:08:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 13 11:08:01 2016 +0000
tree 7d22ddbcf575a78aa821f66306fd191533c19583
parent d31eaeff18ad1f48f353a647feb0b6fcc35339cc
parent 0513f9df1e34c10f9e1527d6d99123e726d9de17

Merge "String : Fix integer overflow in getChars."

luni/src/test/java/libcore/java/lang/StringTest.java

diff --git a/luni/src/test/java/libcore/java/lang/StringTest.java b/luni/src/test/java/libcore/java/lang/StringTest.java
index 2ba6109..1f3320c 100644
--- a/luni/src/test/java/libcore/java/lang/StringTest.java
+++ b/luni/src/test/java/libcore/java/lang/StringTest.java
@@ -425,4 +425,16 @@
         assertEquals(7, hello.codePointCount(5, 12));
         assertEquals(2, hello.codePointCount(10, 12));
     }
+
+    // http://b/26444984
+    public void testGetCharsOverflow() {
+        int srcBegin = Integer.MAX_VALUE; //2147483647
+        int srcEnd = srcBegin + 10;  //-2147483639
+        try {
+            // The output array size must be larger than |srcEnd - srcBegin|.
+            "yes".getChars(srcBegin, srcEnd, new char[256], 0);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+    }
 }

ojluni/src/main/java/java/lang/String.java

diff --git a/ojluni/src/main/java/java/lang/String.java b/ojluni/src/main/java/java/lang/String.java
index a0329b0..5023da8 100755
--- a/ojluni/src/main/java/java/lang/String.java
+++ b/ojluni/src/main/java/java/lang/String.java
@@ -730,7 +730,7 @@
         }
 
         int count = srcEnd - srcBegin;
-        if (count < 0) {
+        if (srcEnd < srcBegin) {
             throw new StringIndexOutOfBoundsException(this, srcBegin, count);
         }