mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-02-09 06:44:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

regex: reject repetitions in some cases with REG_BADRPT

Browse Source 
Previously repetitions were accepted after empty expressions like
in (*|?)|{2}, but in BRE the handling of * and \{\} were not
consistent: they were accepted as literals in some cases and
repetitions in others.

It is better to treat repetitions after an empty expression as an
error (this is allowed by the standard, and glibc mostly does the
same). This is hard to do consistently with the current logic so
the new rule is:

Reject repetitions after empty expressions, except after assertions
^*, $? and empty groups ()+ and never treat them as literals.

Empty alternation (|a) is undefined by the standard, but it can be
useful so that should be accepted.
This commit is contained in:
Szabolcs Nagy 2015-04-18 15:51:16 +00:00 committed by Rich Felker
parent a8cc225384
commit 7eaa76fc2e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/regex/regcomp.c
View File

@ -837,6 +837,10 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s)
node = tre_ast_new_literal(ctx->mem, v, v, ctx->position++);
s--;
break;
case '{':
/* reject repetitions after empty expression in BRE */
if (!ere)
return REG_BADRPT;
default:
if (!ere && (unsigned)*s-'1' < 9) {
/* back reference */
@ -880,10 +884,14 @@ static reg_errcode_t parse_atom(tre_parse_ctx_t *ctx, const char *s)
s++;
break;
case '*':
case '|':
return REG_BADPAT;
case '{':
case '+':
case '?':
/* reject repetitions after empty expression in ERE */
if (ere)
return REG_BADRPT;
case '|':
if (!ere)
goto parse_literal;
case 0:
@ -964,8 +972,9 @@ static reg_errcode_t tre_parse(tre_parse_ctx_t *ctx)
}
parse_iter:
/* extension: repetitions are accepted after an empty node
eg. (+), ^*, a$?, a|{2} */
/* extension: repetitions are rejected after an empty node
eg. (+), |*, {2}, but assertions are not treated as empty
so ^* or $? are accepted currently. */
switch (*s) {
case '+':
case '?':