stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8131039: after adding a function property to Object.prototype, JSON.parse with reviver function goes into infinite loop

Browse Source 
Reviewed-by: hannesw, mhaupt
This commit is contained in:
Athijegannathan Sundararajan 2015-07-16 15:45:54 +05:30
parent 94c9e33a38
commit 2ae906ba4d
2 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSONFunctions.java
View File

@ -104,16 +104,28 @@ public final class JSONFunctions {
final Object val = holder.get(name);
if (val instanceof ScriptObject) {
final ScriptObject valueObj = (ScriptObject)val;
final Iterator<String> iter = valueObj.propertyIterator();
if (valueObj.isArray()) {
final int length = JSType.toInteger(valueObj.getLength());
for (int i = 0; i < length; i++) {
final String key = Integer.toString(i);
final Object newElement = walk(valueObj, key, reviver);
while (iter.hasNext()) {
final String key = iter.next();
final Object newElement = walk(valueObj, key, reviver);
if (newElement == ScriptRuntime.UNDEFINED) {
valueObj.delete(i, false);
} else {
setPropertyValue(valueObj, key, newElement);
}
}
} else {
final String[] keys = valueObj.getOwnKeys(false);
for (final String key : keys) {
final Object newElement = walk(valueObj, key, reviver);
if (newElement == ScriptRuntime.UNDEFINED) {
valueObj.delete(key, false);
} else {
setPropertyValue(valueObj, key, newElement);
if (newElement == ScriptRuntime.UNDEFINED) {
valueObj.delete(key, false);
} else {
setPropertyValue(valueObj, key, newElement);
}
}
}
}

35
nashorn/test/script/basic/JDK-8131039.js Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2015 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-8131039: after adding a function property to Object.prototype, JSON.parse with reviver function goes into infinite loop
*
* @test
* @run
*/
Object.prototype.func = function() {}
function identity(k, v) { return v };
var obj = JSON.parse('{\"name\" : \"nashorn\"}', identity);
Assert.assertTrue(obj.name, "nashorn");