Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java	Thu Oct 01 10:37:25 2015 +0200
     1.2 +++ b/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java	Fri Oct 02 22:32:04 2015 +0200
     1.3 @@ -36,7 +36,7 @@
     1.4   * Handle arrays where the index is very large.
     1.5   */
     1.6  class SparseArrayData extends ArrayData {
     1.7 -    static final int MAX_DENSE_LENGTH = 8 * 1024 * 1024;
     1.8 +    static final int MAX_DENSE_LENGTH = 1024 * 1024;
     1.9  
    1.10      /** Underlying array. */
    1.11      private ArrayData underlying;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8137281.js	Fri Oct 02 22:32:04 2015 +0200
     2.3 @@ -0,0 +1,49 @@
     2.4 +/*
     2.5 + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8137281: OutOfMemoryError with large numeric keys in JSON.parse
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +function createObject(startKey, level1, level2) {
    2.35 +    var root = {};
    2.36 +    var key = startKey;
    2.37 +    for (var i = 0; i < level1; i++) {
    2.38 +        var child = {};
    2.39 +        for (var j = 0; j < level2; j++) {
    2.40 +            child[key++] = {};
    2.41 +        }
    2.42 +        root[key++] = child;
    2.43 +    }
    2.44 +    return root;
    2.45 +}
    2.46 +
    2.47 +JSON.parse(JSON.stringify(createObject(500000, 20, 20)));
    2.48 +JSON.parse(JSON.stringify(createObject(1000000, 20, 20)));
    2.49 +JSON.parse(JSON.stringify(createObject(2000000, 20, 20)));
    2.50 +JSON.parse(JSON.stringify(createObject(4000000, 20, 20)));
    2.51 +JSON.parse(JSON.stringify(createObject(8000000, 20, 20)));
    2.52 +JSON.parse(JSON.stringify(createObject(16000000, 20, 20)));