commit 6e8e72415d6729c9f1de51d1ce5090438002ae3b
author Narayan Kamath <narayan@google.com> Tue Dec 08 20:25:21 2015 +0000
committer Narayan Kamath <narayan@google.com> Wed Dec 09 11:33:45 2015 +0000
tree 192cae64f22e2c3c3ddb3b47e9c9a3713115d46e
parent 4e44045bfa80e8da7b1d135f8af24c2380410140

Sort fails with ArrayIndexOutOfBoundsException

cherry-picked from jdk8.

HG changeset patch:
 User rriggs
 Date 1377531965 14400
      Mon Aug 26 11:46:05 2013 -0400
 Node ID 07585a2483fa6dbe3c3ed91108b8bd5c1eeddee6
 Parent  8a36fc7f494c47fb641ba74b09fae4f6655a7399
 8011944: Sort fails with ArrayIndexOutOfBoundsException
 Summary: Increase the size of pending stack and add test cases
 Reviewed-by: alanb

bug: 26022882
Change-Id: I4b86f9e9222b91cfafebb6af6cb1a027713e4e58

ojluni/src/main/java/java/util/ComparableTimSort.java

diff --git a/ojluni/src/main/java/java/util/ComparableTimSort.java b/ojluni/src/main/java/java/util/ComparableTimSort.java
index 22427a2..4e5e7ac 100755
--- a/ojluni/src/main/java/java/util/ComparableTimSort.java
+++ b/ojluni/src/main/java/java/util/ComparableTimSort.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Google Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -131,7 +132,7 @@
          */
         int stackLen = (len <    120  ?  5 :
                         len <   1542  ? 10 :
-                        len < 119151  ? 19 : 40);
+                        len < 119151  ? 24 : 40);
         runBase = new int[stackLen];
         runLen = new int[stackLen];
     }

ojluni/src/main/java/java/util/TimSort.java

diff --git a/ojluni/src/main/java/java/util/TimSort.java b/ojluni/src/main/java/java/util/TimSort.java
index 0c2e1ec..ad051e5 100755
--- a/ojluni/src/main/java/java/util/TimSort.java
+++ b/ojluni/src/main/java/java/util/TimSort.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Google Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -158,7 +159,7 @@
          */
         int stackLen = (len <    120  ?  5 :
                         len <   1542  ? 10 :
-                        len < 119151  ? 19 : 40);
+                        len < 119151  ? 24 : 40);
         runBase = new int[stackLen];
         runLen = new int[stackLen];
     }