Skip to content

Reset lastIndex on RegExp objects that get reused in closures #428

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.

Sign up for GitHub

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

Merged
mattbaileyuk merged 1 commit into from
Mar 20, 2020
Merged

Reset lastIndex on RegExp objects that get reused in closures #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/jsonata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,8 +1089,9 @@ var jsonata = (function() {
*/
function evaluateRegex(expr) {
var re = new RegExp(expr.value);
var closure = function(str) {
var closure = function(str, fromIndex) {
var result;
re.lastIndex = fromIndex || 0;
var match = re.exec(str);
if(match !== null) {
result = {
Expand All @@ -1108,7 +1109,7 @@ var jsonata = (function() {
if(re.lastIndex >= str.length) {
return undefined;
} else {
var next = closure(str);
var next = closure(str, re.lastIndex);
if(next && next.match === '') {
// matches zero length string; this will never progress
throw {
Expand Down
28 changes: 28 additions & 0 deletions test/test-suite/groups/regex/case037.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"expr": "$map($, $match(?, /^(\\w*\\s\\w*)/)).match",
"data": [
"Felicia Saunders",
"Jimmy Schultz",
"Dolores Figueroa",
"Craig Moreno",
"Lindsey Hall",
"Bonnie Russell",
"Kristin Stewart",
"Owen Reid",
"Brenda Sherman",
"Dwayne Baldwin"
],
"bindings": {},
"result": [
"Felicia Saunders",
"Jimmy Schultz",
"Dolores Figueroa",
"Craig Moreno",
"Lindsey Hall",
"Bonnie Russell",
"Kristin Stewart",
"Owen Reid",
"Brenda Sherman",
"Dwayne Baldwin"
]
}
28 changes: 28 additions & 0 deletions test/test-suite/groups/regex/case038.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"expr": "$map($, function($i){ $match($i, /^(\\w*\\s\\w*)/) }).match",
"data": [
"Felicia Saunders",
"Jimmy Schultz",
"Dolores Figueroa",
"Craig Moreno",
"Lindsey Hall",
"Bonnie Russell",
"Kristin Stewart",
"Owen Reid",
"Brenda Sherman",
"Dwayne Baldwin"
],
"bindings": {},
"result": [
"Felicia Saunders",
"Jimmy Schultz",
"Dolores Figueroa",
"Craig Moreno",
"Lindsey Hall",
"Bonnie Russell",
"Kristin Stewart",
"Owen Reid",
"Brenda Sherman",
"Dwayne Baldwin"
]
}