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

8069002: NPE on invoking null (8068889 regression)

Browse Source 
Reviewed-by: jlaskey, sundar
This commit is contained in:
Attila Szegedi 2015-01-14 18:25:01 +01:00
parent 7090b1cdf5
commit 4935529d4d
2 changed files with 36 additions and 1 deletions
nashorn
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker
NashornBeansLinker.java
test/script/basic
JDK-8069002.js

2
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java

@ -101,7 +101,7 @@ public class NashornBeansLinker implements GuardingDynamicLinker {
return invocation == null ? null : invocation.filterArguments(0, FILTER_CONSSTRING); return invocation == null ? null : invocation.filterArguments(0, FILTER_CONSSTRING);
} }
if ("call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) { if (self != null && "call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) {
// Support dyn:call on any object that supports some @FunctionalInterface // Support dyn:call on any object that supports some @FunctionalInterface
// annotated interface. This way Java method, constructor references or // annotated interface. This way Java method, constructor references or
// implementations of java.util.function.* interfaces can be called as though // implementations of java.util.function.* interfaces can be called as though

35
nashorn/test/script/basic/JDK-8069002.js Normal file

@ -0,0 +1,35 @@
/*
* Copyright (c) 2014 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-8069002: NPE on invoking null (8068889 regression)
*
* @test
* @run
*/
try {
null();
} catch (e) {
Assert.assertTrue(e instanceof TypeError);
}