changeset 1983:b8976a6ed2bc

8184723: jdk.nashorn.internal.runtime.linker.JSObjectLinker.callToApply erroneously asserts given arguments Reviewed-by: sundar, hannesw Contributed-by: priya.lakshmi.muthuswamy@oracle.com
author hannesw
date Wed, 30 Aug 2017 18:47:37 +0200
parents b1b810f62830
children ce5973feed58
files src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java test/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java
diffstat 2 files changed, 60 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Fri Aug 25 04:59:23 2017 +0000
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java	Wed Aug 30 18:47:37 2017 +0200
@@ -213,7 +213,7 @@
 
     @SuppressWarnings("unused")
     private static Object callToApply(final MethodHandle mh, final JSObject obj, final Object thiz, final Object... args) {
-        assert args.length >= 2;
+        assert args.length >= 1;
         final Object   receiver  = args[0];
         final Object[] arguments = new Object[args.length - 1];
         System.arraycopy(args, 1, arguments, 0, arguments.length);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/src/jdk/nashorn/internal/runtime/linker/test/JDK_8184723_Test.java	Wed Aug 30 18:47:37 2017 +0200
@@ -0,0 +1,59 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.nashorn.internal.runtime.linker.test;
+
+import jdk.nashorn.api.scripting.AbstractJSObject;
+import jdk.nashorn.api.scripting.NashornScriptEngine;
+import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+
+/**
+ * @test
+ * @bug 8184723
+ * @summary jdk.nashorn.internal.runtime.linker.JSObjectLinker.callToApply erroneously asserts given arguments
+ * @modules jdk.scripting.nashorn/jdk.nashorn.internal.runtime.linker
+ * @run main/othervm -ea jdk.nashorn.internal.runtime.linker.test.JDK_8184723_Test
+ */
+
+public class JDK_8184723_Test {
+    public static void main(String args[]) throws Exception {
+        NashornScriptEngine engine = (NashornScriptEngine) new NashornScriptEngineFactory().getScriptEngine();
+        AbstractJSObject obj = new AbstractJSObject() {
+            @Override
+            public Object getMember(String name) {
+                return this;
+            }
+
+            @Override
+            public Object call(Object thiz, Object... args) {
+                return thiz;
+            }
+
+        };
+
+        engine.put("a", obj);
+        engine.eval("function b(){ a.apply(null,arguments);};b();");
+    }
+}