regexp: fix non greedy quantizers with zero length matches

This commit is contained in:
Fabrice Bellard 2024-05-30 16:41:37 +02:00
parent d86aaf0b8f
commit 36911f0d3a
2 changed files with 8 additions and 8 deletions

View File

@ -1488,15 +1488,13 @@ static int re_parse_term(REParseState *s, BOOL is_backward_dir)
if (dbuf_error(&s->byte_code)) if (dbuf_error(&s->byte_code))
goto out_of_memory; goto out_of_memory;
}
/* the spec tells that if there is no advance when /* the spec tells that if there is no advance when
running the atom after the first quant_min times, running the atom after the first quant_min times,
then there is no match. We remove this test when we then there is no match. We remove this test when we
are sure the atom always advances the position. */ are sure the atom always advances the position. */
add_zero_advance_check = re_need_check_advance(s->byte_code.buf + last_atom_start, add_zero_advance_check = re_need_check_advance(s->byte_code.buf + last_atom_start,
s->byte_code.size - last_atom_start); s->byte_code.size - last_atom_start);
} else {
add_zero_advance_check = FALSE;
}
{ {
int len, pos; int len, pos;

View File

@ -678,6 +678,8 @@ function test_regexp()
assert(a, ["a", undefined]); assert(a, ["a", undefined]);
a = /(?:|[\w])+([0-9])/.exec("123a23"); a = /(?:|[\w])+([0-9])/.exec("123a23");
assert(a, ["123a23", "3"]); assert(a, ["123a23", "3"]);
a = /()*?a/.exec(",");
assert(a, null);
} }
function test_symbol() function test_symbol()