8193137: Nashorn crashes when given an empty script file

Priya Lakshmi Muthuswamy · hns · commit 6534e2ad5406 · 2017-12-08T12:02:30.000+01:00
Reviewed-by: hannesw, sundar
diff --git a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
@@ -295,7 +295,7 @@ private static String[] preprocessArgs(final String[] args) {
                 } catch (final IOException ioe) {
                     // ignore
                 }
-                if (l.startsWith("#!")) {
+                if (l != null && l.startsWith("#!")) {
                     shebangFilePos = i;
                 }
                 // We're only checking the first non-option argument. If it's not a shebang file, we're in normal
diff --git a/test/nashorn/script/nosecurity/JDK-8193137.js b/test/nashorn/script/nosecurity/JDK-8193137.js
@@ -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.
+ */
+
+/**
+ * JDK-8193137 : Nashorn crashes when given an empty script file.
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+var System = java.lang.System;
+var File = java.io.File;
+var javahome = System.getProperty("java.home");
+var nashornJar = new File(System.getProperty("nashorn.jar"));
+if (! nashornJar.isAbsolute()) {
+    nashornJar = new File(".", nashornJar);
+}
+
+// we want to use nashorn.jar passed and not the one that comes with JRE
+var jjsCmd = javahome + "/../bin/jjs";
+jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
+if (! new File(jjsCmd).isFile()) {
+    jjsCmd = javahome + "/bin/jjs";
+    jjsCmd = jjsCmd.toString().replace(/\//g, File.separator);
+}
+jjsCmd += " -J--patch-module=jdk.scripting.nashorn=" + nashornJar;
+
+$ENV.PWD=System.getProperty("user.dir")
+
+var emptyFile = new File($ENV.PWD+File.separator+"empty.js");
+emptyFile.createNewFile();
+emptyFile.deleteOnExit();
+
+$EXEC(jjsCmd + " empty.js");
+if($ERR != "")
+    fail("jjs fails with empty script file");

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ private static String[] preprocessArgs(final String[] args) {`
`295`	`295`	`} catch (final IOException ioe) {`
`296`	`296`	`// ignore`
`297`	`297`	`}`
`298`		`- if (l.startsWith("#!")) {`
	`298`	`+ if (l != null && l.startsWith("#!")) {`
`299`	`299`	`shebangFilePos = i;`
`300`	`300`	`}`
`301`	`301`	`// We're only checking the first non-option argument. If it's not a shebang file, we're in normal`