infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails

Browse Source 
Reviewed-by: sundar, jlaskey
This commit is contained in:
Hannes Wallnöfer 2018-06-08 11:08:38 +02:00
parent 414f5b66b8
commit 594e5df577
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
View File

@ -541,7 +541,6 @@ class ByteCodeMachine extends StackMachine {
sprev = s;
s++;
}
sprev = sbegin; // break;
}
private void opAnyCharMLStar() {
@ -550,7 +549,6 @@ class ByteCodeMachine extends StackMachine {
sprev = s;
s++;
}
sprev = sbegin; // break;
}
private void opAnyCharStarPeekNext() {

35
test/nashorn/script/basic/JDK-8204288.js Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2018, 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-8204288: Matching the end of a string followed by an empty greedy regex and a word boundary fails
*
* @test
* @run
*/
Assert.assertEquals(new RegExp("c.*\\b").exec("abc")[0], "c");
Assert.assertEquals(new RegExp("abc.*\\b").exec("abc")[0], "abc");
Assert.assertEquals(new RegExp("\\b.*abc.*\\b").exec("abc")[0], "abc");