diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-11-07 12:43:24 -0500 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-11-07 12:43:24 -0500 |
commit | 44fc25153681f0d3814275926f3c626a3f283cc2 (patch) | |
tree | 974d930476bacaec873c5e5c4c2875a35afa71ea /src | |
parent | 695012a0d585844130bf3d82ad0b4ebe0b7bf581 (diff) | |
download | postgresql-44fc25153681f0d3814275926f3c626a3f283cc2.tar.gz postgresql-44fc25153681f0d3814275926f3c626a3f283cc2.zip |
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.
Diffstat (limited to 'src')
-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 09ec8f3c894..487b5dabb82 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -944,7 +944,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 be151858a38..ba2923982f5 100644 --- a/src/test/regress/expected/regex.out +++ b/src/test/regress/expected/regex.out @@ -321,3 +321,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 c59fa35f24d..7cf5e599822 100644 --- a/src/test/regress/sql/regex.sql +++ b/src/test/regress/sql/regex.sql @@ -82,3 +82,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))'; |