# HG changeset patch # User hannesw # Date 1512730950 -3600 # Node ID 04a527d98719f23e3d1375a20bd076937b0b2057 # Parent ebe6c3bee2055e41e6268639101aedce0e6dcd61 8193137: Nashorn crashes when given an empty script file Reviewed-by: hannesw, sundar Contributed-by: priya.lakshmi.muthuswamy@oracle.com diff -r ebe6c3bee205 -r 04a527d98719 src/jdk/nashorn/tools/Shell.java --- a/src/jdk/nashorn/tools/Shell.java Mon Jun 29 21:30:31 2020 +0100 +++ b/src/jdk/nashorn/tools/Shell.java Fri Dec 08 12:02:30 2017 +0100 @@ -288,7 +288,7 @@ } catch (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 -r ebe6c3bee205 -r 04a527d98719 test/script/nosecurity/JDK-8193137.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/nosecurity/JDK-8193137.js Fri Dec 08 12:02:30 2017 +0100 @@ -0,0 +1,62 @@ +/* + * 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 + */ + +if (typeof fail != 'function') { + fail = print; +} + +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); +} + +$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");