diff options
author | Tom Lane | 2015-11-07 17:43:24 +0000 |
---|---|---|
committer | Tom Lane | 2015-11-07 17:43:24 +0000 |
commit | a43b4ab1111ca5e5f40a2ddd8e56bf999b9fdad9 (patch) | |
tree | dabca2ce1a13f260c9cc09db9a59fdee4aac3e36 | |
parent | 8d7396e5092f1bc6433a38ccabaf88c8c681de11 (diff) |
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.
-rw-r--r-- | src/backend/regex/regcomp.c | 2 | ||||
-rw-r--r-- | src/test/regress/expected/regex.out | 5 | ||||
-rw-r--r-- | src/test/regress/sql/regex.sql | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index aa759c2648..a165b3b1ca 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -951,7 +951,7 @@ parseqatom(struct vars * v, EMPTYARC(lp, s); EMPTYARC(s2, rp); NOERR(); - atom = parse(v, ')', PLAIN, s, s2); + atom = parse(v, ')', type, s, s2); assert(SEE(')') || ISERR()); NEXT(); NOERR(); diff --git a/src/test/regress/expected/regex.out b/src/test/regress/expected/regex.out index f0e2fc9eb8..07fb023534 100644 --- a/src/test/regress/expected/regex.out +++ b/src/test/regress/expected/regex.out @@ -490,3 +490,8 @@ select 'a' ~ '()+\1'; t (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 diff --git a/src/test/regress/sql/regex.sql b/src/test/regress/sql/regex.sql index d3030af295..c45bdc91d8 100644 --- a/src/test/regress/sql/regex.sql +++ b/src/test/regress/sql/regex.sql @@ -117,3 +117,7 @@ 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))'; |