aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-02-18 22:38:55 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2021-02-18 22:38:55 -0500
commit6e6fecf495386e8aebfdc71ad6998eceb9da45e3 (patch)
treec91058eeade6e64274c0e4d24b0ef6c50d2365d6
parent5d319ce86f13d1b0e7fb911408fe012723259723 (diff)
downloadpostgresql-6e6fecf495386e8aebfdc71ad6998eceb9da45e3.tar.gz
postgresql-6e6fecf495386e8aebfdc71ad6998eceb9da45e3.zip
Fix another ancient bug in parsing of BRE-mode regular expressions.
While poking at the regex code, I happened to notice that the bug squashed in commit afcc8772e had a sibling: next() failed to return a specific value associated with the '}' token for a "\{m,n\}" quantifier when parsing in basic RE mode. Again, this could result in treating the quantifier as non-greedy, which it never should be in basic mode. For that to happen, the last character before "\}" that sets "nextvalue" would have to set it to zero, or it'd have to have accidentally been zero from the start. The failure can be provoked repeatably with, for example, a bound ending in digit "0". Like the previous patch, back-patch all the way.
-rw-r--r--src/backend/regex/regc_lex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c
index ca2bce48312..16664531641 100644
--- a/src/backend/regex/regc_lex.c
+++ b/src/backend/regex/regc_lex.c
@@ -389,7 +389,7 @@ next(struct vars *v)
{
v->now++;
INTOCON(L_BRE);
- RET('}');
+ RETV('}', 1);
}
else
FAILW(REG_BADBR);