Skip to content

Fixed regexp undefined value of captured group. #900

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
VadimZhestikov merged 1 commit into from
May 1, 2025
Merged

Fixed regexp undefined value of captured group. #900

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
19 changes: 2 additions & 17 deletions src/njs_regexp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,24 +1148,12 @@ njs_regexp_exec_result(njs_vm_t *vm, njs_value_t *r, njs_utf8_t utf8,
static void
njs_regexp_exec_result_free(njs_vm_t *vm, njs_array_t *result)
{
njs_uint_t n;
njs_value_t *start;
njs_flathsh_t *hash;
njs_object_prop_t *prop;
njs_flathsh_elt_t *elt;
njs_flathsh_each_t lhe;
njs_flathsh_query_t lhq;

if (result->object.fast_array) {
start = result->start;

for (n = 0; n < result->length; n++) {
if (start[n].type == NJS_STRING) {
njs_mp_free(vm->mem_pool, start[n].string.data);
}
}
}

njs_flathsh_each_init(&lhe, &njs_object_hash_proto);

hash = &result->object.hash;
Expand Down Expand Up @@ -1581,7 +1569,7 @@ njs_regexp_prototype_symbol_split(njs_vm_t *vm, njs_value_t *args,
njs_value_t r, z, this, s_lvalue, setval, constructor;
njs_object_t *object;
const u_char *start, *end;
njs_string_prop_t s, sv;
njs_string_prop_t s;
njs_value_t arguments[2];

rx = njs_argument(args, 0);
Expand Down Expand Up @@ -1771,10 +1759,7 @@ njs_regexp_prototype_symbol_split(njs_vm_t *vm, njs_value_t *args,
return NJS_ERROR;
}

(void) njs_string_prop(vm, &sv, retval);

ret = njs_array_string_add(vm, array, sv.start, sv.size,
sv.length);
ret = njs_array_add(vm, array, retval);
if (njs_slow_path(ret != NJS_OK)) {
return ret;
}
Expand Down
3 changes: 3 additions & 0 deletions src/test/njs_unit_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9791,6 +9791,9 @@ static njs_unit_test_t njs_test[] =
{ njs_str("'myCamelCaseString'.split(/(?=[A-Z])/)"),
njs_str("my,Camel,Case,String") },

{ njs_str("var r = ' a'.split(/|()/); r+'|'+typeof r[0]+':'+typeof r[1]+':'+typeof r[2]"),
njs_str(" ,,a|string:undefined:string") },

{ njs_str("'мояВерблюжьяСтрока'.split(/(?=[А-Я])/)"),
njs_str("моя,Верблюжья,Строка") },

Expand Down