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

8165198: Inconsistent values with JavaImporter after accessing undefined variable

Browse Source 
Reviewed-by: sundar, hannesw
This commit is contained in:
Priya Lakshmi Muthuswamy 2017-10-23 13:03:01 +02:00 committed by Hannes Wallnöfer
parent 6bfb868454
commit 6a0b70e242
4 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
View File

@ -2136,7 +2136,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
// Similar to getProtoSwitchPoints method above, but used for additional prototype switchpoints of
// properties that are known not to exist, e.g. the original property name in a __noSuchProperty__ invocation.
private SwitchPoint getProtoSwitchPoint(final String name) {
final SwitchPoint getProtoSwitchPoint(final String name) {
if (getProto() == null) {
return null;
}

4
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
View File

@ -138,9 +138,9 @@ public final class WithObject extends Scope {
find = expression.findProperty(fallBack, true);
if (find != null) {
if (NO_SUCH_METHOD_NAME.equals(fallBack)) {
link = expression.noSuchMethod(desc, request);
link = expression.noSuchMethod(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
} else if (NO_SUCH_PROPERTY_NAME.equals(fallBack)) {
link = expression.noSuchProperty(desc, request);
link = expression.noSuchProperty(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
}
}
}

37
test/nashorn/script/nosecurity/JDK-8165198.js Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2017, 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-8165198: Inconsistent values with JavaImporter after accessing undefined variable
*
* @test
* @run
*/
var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
var e = new NashornScriptEngineFactory().getScriptEngine("-ot=false");
var output = e.eval("with(new JavaImporter(java.util)){x}");
print(output);
e.eval("with(new JavaImporter(java.util)){x=1}");
var output2 = e.eval("with(new JavaImporter(java.util)){x}");
print(output2);

2
test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED Normal file
View File

@ -0,0 +1,2 @@
null
1