Skip to content

Update RegExpBuiltInExec to latest spec #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,9 @@ private static MatchResult matchResultOrNull(ExecutionContext cx, RegExpObject r
/* steps 2-3 (not applicable) */
/* steps 4-5 */
int lastIndex = (int) Math.min(ToLength(cx, Get(cx, r, "lastIndex")), Integer.MAX_VALUE);
/* steps 6-7 */
boolean global = ToBoolean(Get(cx, r, "global"));
/* steps 8-9 */
boolean sticky = ToBoolean(Get(cx, r, "sticky"));
/* ES2016 steps 5-7 */
boolean global = r.isSet(RegExpObject.Flags.Global);
boolean sticky = r.isSet(RegExpObject.Flags.Sticky);
/* steps 10-15 */
MatchState m = matchOrNull(r, s, lastIndex, global, sticky);
/* step 15.a, 15.c */
Expand Down
40 changes: 25 additions & 15 deletions src/test/scripts/suite/regress/bug2625.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,35 @@ const {

// 21.2.5.7 RegExp.prototype.replace, 21.2.5.2.1 RegExpExec: Dynamic flags retrieval is unsafe
// https://bugs.ecmascript.org/show_bug.cgi?id=2625
/**
* ES2015 section 21.2.5.8 ("RegExp.prototype [ @@replace ]"), step 16.p.i
* reads:
*
* > NOTE position should not normally move backwards. If it does, it is an
* > indication of an ill-behaving RegExp subclass or use of an access
* > triggered side-effect to change the global flag or other characteristics
* > of rx. In such cases, the corresponding substitution is ignored.
*/

{
let re = /test/;
let glob = true;
let re = /test/g;
let c = 0;
Object.defineProperty(re, "global", {
get() {
c += 1;
if (c == 3) {
re.compile(/pre/);
}
if (c == 4) {
re.compile(/kaboom/);
}
let g = glob;
glob = false;
return g;
re.exec = function() {
let result;
c += 1;
if (c == 1) {
this.lastIndex = 8;
let val = ["test"];
val.index = 4;
return val;
}
if (c == 2) {
result = ["pre"];
result.index = 0;
return result;
}
});
return null;
};
let s = "pre-test".replace(re, () => {});
assertSame("pre-undefined", s);
}