Mon, 27 May 2013 13:12:11 +0200
Merge
1.1 --- a/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Mon May 27 13:11:13 2013 +0200 1.2 +++ b/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java Mon May 27 13:12:11 2013 +0200 1.3 @@ -868,6 +868,9 @@ 1.4 * \ ClassEscape 1.5 */ 1.6 private boolean classAtomNoDash() { 1.7 + if (atEOF()) { 1.8 + return false; 1.9 + } 1.10 final int startIn = position; 1.11 final int startOut = sb.length(); 1.12
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/script/basic/JDK-8015348.js Mon May 27 13:12:11 2013 +0200 2.3 @@ -0,0 +1,35 @@ 2.4 +/* 2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +/** 2.28 + * JDK-8015348: RegExp("[") results in StackOverflowError 2.29 + * 2.30 + * @test 2.31 + * @run 2.32 + */ 2.33 + 2.34 +try { 2.35 + new RegExp('['); 2.36 +} catch (error) { 2.37 + print(error.name); 2.38 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/script/basic/JDK-8015348.js.EXPECTED Mon May 27 13:12:11 2013 +0200 3.3 @@ -0,0 +1,1 @@ 3.4 +SyntaxError