mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-25 21:57:33 +02:00
Fix misoptimization of "{1,1}" quantifiers in regular expressions.
A bounded quantifier with m = n = 1 might be thought a no-op. But according to our documentation (which traces back to Henry Spencer's original man page) it still imposes greediness, or non-greediness in the case of the non-greedy variant "{1,1}?", on whatever it's attached to. This turns out not to work though, because parseqatom() optimizes away the m = n = 1 case without regard for whether it's supposed to change the greediness of the argument RE. We can fix this by just not applying the optimization when the greediness needs to change; the subsequent general cases handle it fine. The three cases in which we can still apply the optimization are (a) no quantifier, or quantifier does not impose a preference; (b) atom has no greediness property, implying it cannot match a variable amount of text anyway; or (c) quantifier's greediness is same as atom's. Note that in most cases where one of these applies, we'd have exited earlier in the "not a messy case" fast path. I think it's now only possible to get to the optimization when the atom involves capturing parentheses or a non-top-level backref. Back-patch to all supported branches. I'd ordinarily be hesitant to put a subtle behavioral change into back branches, but in this case it's very hard to see a reason why somebody would write "{1,1}?" unless they're trying to get the documented change-of-greediness behavior. Discussion: https://postgr.es/m/5bb27a41-350d-37bf-901e-9d26f5592dd0@charter.net
This commit is contained in:
parent
4ec14e5aa1
commit
72ce7acaf3
@ -1155,7 +1155,10 @@ parseqatom(struct vars *v,
|
|||||||
/* rest of branch can be strung starting from atom->end */
|
/* rest of branch can be strung starting from atom->end */
|
||||||
s2 = atom->end;
|
s2 = atom->end;
|
||||||
}
|
}
|
||||||
else if (m == 1 && n == 1)
|
else if (m == 1 && n == 1 &&
|
||||||
|
(qprefer == 0 ||
|
||||||
|
(atom->flags & (LONGER | SHORTER | MIXED)) == 0 ||
|
||||||
|
qprefer == (atom->flags & (LONGER | SHORTER | MIXED))))
|
||||||
{
|
{
|
||||||
/* no/vacuous quantifier: done */
|
/* no/vacuous quantifier: done */
|
||||||
EMPTYARC(s, atom->begin); /* empty prefix */
|
EMPTYARC(s, atom->begin); /* empty prefix */
|
||||||
|
@ -492,6 +492,55 @@ select regexp_matches('foo/bar/baz',
|
|||||||
{foo,bar,baz}
|
{foo,bar,baz}
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
|
-- Test that greediness can be overridden by outer quantifier
|
||||||
|
select regexp_matches('llmmmfff', '^(l*)(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
----------------
|
||||||
|
{ll,mmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
----------------
|
||||||
|
{ll,mmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}?(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
------------------
|
||||||
|
{"",llmmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}?(.*){1,1}?(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
----------------
|
||||||
|
{"",llmmm,fff}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?)(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
------------------
|
||||||
|
{"",llmmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
----------------
|
||||||
|
{ll,mmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}?(.*)(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
------------------
|
||||||
|
{"",llmmmfff,""}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}?(.*){1,1}?(f*)$');
|
||||||
|
regexp_matches
|
||||||
|
----------------
|
||||||
|
{"",llmmm,fff}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
-- Test for infinite loop in cfindloop with zero-length possible match
|
-- Test for infinite loop in cfindloop with zero-length possible match
|
||||||
-- but no actual match (can only happen in the presence of backrefs)
|
-- but no actual match (can only happen in the presence of backrefs)
|
||||||
select 'a' ~ '$()|^\1';
|
select 'a' ~ '$()|^\1';
|
||||||
|
@ -118,6 +118,16 @@ select regexp_matches('Programmer', '(\w)(.*?\1)', 'g');
|
|||||||
select regexp_matches('foo/bar/baz',
|
select regexp_matches('foo/bar/baz',
|
||||||
'^([^/]+?)(?:/([^/]+?))(?:/([^/]+?))?$', '');
|
'^([^/]+?)(?:/([^/]+?))(?:/([^/]+?))?$', '');
|
||||||
|
|
||||||
|
-- Test that greediness can be overridden by outer quantifier
|
||||||
|
select regexp_matches('llmmmfff', '^(l*)(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}?(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*){1,1}?(.*){1,1}?(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?)(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}?(.*)(f*)$');
|
||||||
|
select regexp_matches('llmmmfff', '^(l*?){1,1}?(.*){1,1}?(f*)$');
|
||||||
|
|
||||||
-- Test for infinite loop in cfindloop with zero-length possible match
|
-- Test for infinite loop in cfindloop with zero-length possible match
|
||||||
-- but no actual match (can only happen in the presence of backrefs)
|
-- but no actual match (can only happen in the presence of backrefs)
|
||||||
select 'a' ~ '$()|^\1';
|
select 'a' ~ '$()|^\1';
|
||||||
|
Loading…
Reference in New Issue
Block a user