changeset 994:e56bfeff25a9

8056123: Anonymous function statements leak internal function names into global scope Reviewed-by: hannesw, attila
author sundar
date Wed, 27 Aug 2014 14:27:56 +0530
parents dbb723e6c54c
children 734bdd565748
files src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java test/script/basic/JDK-8056123.js test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java
diffstat 3 files changed, 55 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java	Tue Aug 26 22:57:24 2014 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java	Wed Aug 27 14:27:56 2014 +0530
@@ -485,7 +485,7 @@
         if (functionNode.isDeclared()) {
             final Iterator<Block> blocks = lc.getBlocks();
             if (blocks.hasNext()) {
-                defineSymbol(blocks.next(), functionNode.getIdent().getName(), IS_VAR);
+                defineSymbol(blocks.next(), functionNode.getIdent().getName(), IS_VAR | (functionNode.isAnonymous()? IS_INTERNAL : 0));
             }
         }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8056123.js	Wed Aug 27 14:27:56 2014 +0530
@@ -0,0 +1,45 @@
+/*
+ * 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-8056123: Anonymous function statements leak internal function names into global scope
+ *
+ * @test
+ * @run
+ */
+
+// do *not* introduce newlines before this line!
+function () { // line 32
+  print("hello function!");
+}
+
+if (typeof this["L:32"] != 'undefined') {
+   fail("anonymous function statement leaks name in global");
+}
+
+var keys = Object.keys(this);
+for (var i in keys) {
+    if (keys[i].contains("L:")) {
+        fail("found " + keys[i] + " in global scope");
+    }
+}
--- a/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java	Tue Aug 26 22:57:24 2014 +0530
+++ b/test/src/jdk/nashorn/api/scripting/ScriptObjectMirrorTest.java	Wed Aug 27 14:27:56 2014 +0530
@@ -374,4 +374,13 @@
         final Object global = e.eval("this");
         assertFalse(global.equals(jsobj.eval("this")));
     }
+
+    @Test
+    public void topLevelAnonFuncStatement() throws Exception {
+        final ScriptEngineManager engineManager = new ScriptEngineManager();
+        final ScriptEngine e = engineManager.getEngineByName("nashorn");
+        final JSObject func = (JSObject)e.eval("function(x) { return x + ' world' }");
+        assertTrue(func.isFunction());
+        assertEquals(func.call(e.eval("this"), "hello"), "hello world");
+    }
 }