aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannesw <none@none>2013-07-15 18:32:23 +0200
committerhannesw <none@none>2013-07-15 18:32:23 +0200
commitb9df77c9b587d63564def1ed83a6d99b4ea67013 (patch)
tree29154a4dcd4359a3483af66a69d3e6a131f4a493
parent5bc5ea6a3016b6dee8a660b88adda3c008e6c490 (diff)
downloadnashorn-b9df77c9b587d63564def1ed83a6d99b4ea67013.tar.gz
8020358: Array(0xfffffff) throws OutOfMemoryError
Reviewed-by: jlaskey, sundar
-rw-r--r--src/jdk/nashorn/internal/runtime/arrays/ArrayData.java9
-rw-r--r--test/script/basic/JDK-8020358.js43
-rw-r--r--test/script/basic/JDK-8020358.js.EXPECTED7
3 files changed, 57 insertions, 2 deletions
diff --git a/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
index d11059b2..9e3efeed 100644
--- a/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
+++ b/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
@@ -75,8 +75,13 @@ public abstract class ArrayData {
* @return ArrayData
*/
public static ArrayData allocate(final int length) {
- final ArrayData arrayData = new IntArrayData(length);
- return length == 0 ? arrayData : new DeletedRangeArrayFilter(arrayData, 0, length - 1);
+ if (length == 0) {
+ return new IntArrayData();
+ } else if (length >= SparseArrayData.MAX_DENSE_LENGTH) {
+ return new SparseArrayData(EMPTY_ARRAY, length);
+ } else {
+ return new DeletedRangeArrayFilter(new IntArrayData(length), 0, length - 1);
+ }
}
/**
diff --git a/test/script/basic/JDK-8020358.js b/test/script/basic/JDK-8020358.js
new file mode 100644
index 00000000..401531de
--- /dev/null
+++ b/test/script/basic/JDK-8020358.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8020358: Array(0xfffffff) throws OutOfMemoryError
+ *
+ * @test
+ * @run
+ */
+
+var x = new Array(0xfffffff);
+print(x.length);
+x[0xffffffe] = 1;
+print(x.length);
+x[0xfffffff] = 1;
+print(x.length);
+
+x = new Array(0x8ffff);
+print(x.length);
+print(Function("return 'ok'").apply(null, x));
+x[0] = "pass";
+print(Function("p", "return p").apply(null, x));
+print(Function("return arguments[0]").apply(null, x));
diff --git a/test/script/basic/JDK-8020358.js.EXPECTED b/test/script/basic/JDK-8020358.js.EXPECTED
new file mode 100644
index 00000000..5b6db365
--- /dev/null
+++ b/test/script/basic/JDK-8020358.js.EXPECTED
@@ -0,0 +1,7 @@
+268435455
+268435455
+268435456
+589823
+ok
+pass
+pass