system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-02 22:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow -DNO_STRICT_REGEX to restore historic regex behavior

Browse source 
Allow restoring the behavior of '{' as described in regex(3).
Ie. only treat it as start of bounds if followed by a digit.

If NO_STRICT_REGEX is not defined, the behavior introduced by
commit a4a801688c is retained,
otherwise the previous behavior is restored.

Differential Revision:	https://reviews.freebsd.org/D45134
This commit is contained in:
Simon J. Gerraty 2024-05-09 18:29:43 -07:00
parent 6437872c1d
commit f77b5b295d
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/libc/regex/regcomp.c
View file

@ -453,7 +453,9 @@ p_ere_exp(struct parse *p, struct branchc *bc)
case '*':
case '+':
case '?':
#ifndef NO_STRICT_REGEX
case '{':
#endif
SETERROR(REG_BADRPT);
break;
case '.':
@ -536,6 +538,11 @@ p_ere_exp(struct parse *p, struct branchc *bc)
break;
}
break;
#ifdef NO_STRICT_REGEX
case '{': /* okay as ordinary except if digit follows */
(void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
/* FALLTHROUGH */
#endif
default:
if (p->error != 0)
return (false);
@ -549,11 +556,19 @@ p_ere_exp(struct parse *p, struct branchc *bc)
return (false);
c = PEEK();
/* we call { a repetition if followed by a digit */
if (!( c == '*' || c == '+' || c == '?' || c == '{'))
if (!( c == '*' || c == '+' || c == '?' ||
#ifdef NO_STRICT_REGEX
(c == '{' && MORE2() && isdigit((uch)PEEK2()))
#else
c == '{'
#endif
))
return (false); /* no repetition, we're done */
#ifndef NO_STRICT_REGEX
else if (c == '{')
(void)REQUIRE(MORE2() && \
(isdigit((uch)PEEK2()) || PEEK2() == ','), REG_BADRPT);
#endif
NEXT();
(void)REQUIRE(!wascaret, REG_BADRPT);
@ -892,6 +907,9 @@ p_simp_re(struct parse *p, struct branchc *bc)
(void)REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
break;
case BACKSL|')': /* should not get here -- must be user */
#ifdef NO_STRICT_REGEX
case BACKSL|'}':
#endif
SETERROR(REG_EPAREN);
break;
case BACKSL|'1':