stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8164708: String.prototype.replace replaces empty match twice

Browse Source 
Reviewed-by: sundar, attila
This commit is contained in:
Hannes Wallnöfer 2016-10-24 13:20:27 +02:00
parent da7114d2a6
commit eb56550d40
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeRegExp.java
View File

@ -701,13 +701,9 @@ public final class NativeRegExp extends ScriptObject {
}
thisIndex = matcher.end();
if (thisIndex == string.length() && matcher.start() == matcher.end()) {
// Avoid getting empty match at end of string twice
break;
}
// ECMA 15.5.4.10 String.prototype.match(regexp)
if (thisIndex == previousLastIndex) {
// ECMA6 21.2.5.6 step 8.g.iv.5: If matchStr is empty advance index by one
if (matcher.start() == matcher.end()) {
setLastIndex(thisIndex + 1);
previousLastIndex = thisIndex + 1;
} else {

32
nashorn/test/script/basic/JDK-8164708.js Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2016, 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-8164708: String.prototype.replace replaces empty match twice
*
* @test
* @run
*/
Assert.assertEquals("4005".replace(/\B(?=(\d{3})+(?!\d))/g, ","), "4,005");