Commit a43b4ab1 authored by Tom Lane's avatar Tom Lane

Fix enforcement of restrictions inside regexp lookaround constraints.

Lookahead and lookbehind constraints aren't allowed to contain backrefs,
and parentheses within them are always considered non-capturing.  Or so
says the manual.  But the regexp parser forgot about these rules once
inside a parenthesized subexpression, so that constructs like (\w)(?=(\1))
were accepted (but then not correctly executed --- a case like this acted
like (\w)(?=\w), without any enforcement that the two \w's match the same
text).  And in (?=((foo))) the innermost parentheses would be counted as
capturing parentheses, though no text would ever be captured for them.

To fix, properly pass down the "type" argument to the recursive invocation
of parse().

Back-patch to all supported branches; it was agreed that silent
misexecution of such patterns is worse than throwing an error, even though
new errors in minor releases are generally not desirable.
parent 8d7396e5
...@@ -951,7 +951,7 @@ parseqatom(struct vars * v, ...@@ -951,7 +951,7 @@ parseqatom(struct vars * v,
EMPTYARC(lp, s); EMPTYARC(lp, s);
EMPTYARC(s2, rp); EMPTYARC(s2, rp);
NOERR(); NOERR();
atom = parse(v, ')', PLAIN, s, s2); atom = parse(v, ')', type, s, s2);
assert(SEE(')') || ISERR()); assert(SEE(')') || ISERR());
NEXT(); NEXT();
NOERR(); NOERR();
......
...@@ -490,3 +490,8 @@ select 'a' ~ '()+\1'; ...@@ -490,3 +490,8 @@ select 'a' ~ '()+\1';
t t
(1 row) (1 row)
-- Error conditions
select 'xyz' ~ 'x(\w)(?=\1)'; -- no backrefs in LACONs
ERROR: invalid regular expression: invalid backreference number
select 'xyz' ~ 'x(\w)(?=(\1))';
ERROR: invalid regular expression: invalid backreference number
...@@ -117,3 +117,7 @@ select 'a' ~ '$()|^\1'; ...@@ -117,3 +117,7 @@ select 'a' ~ '$()|^\1';
select 'a' ~ '.. ()|\1'; select 'a' ~ '.. ()|\1';
select 'a' ~ '()*\1'; select 'a' ~ '()*\1';
select 'a' ~ '()+\1'; select 'a' ~ '()+\1';
-- Error conditions
select 'xyz' ~ 'x(\w)(?=\1)'; -- no backrefs in LACONs
select 'xyz' ~ 'x(\w)(?=(\1))';
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment