diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-19 12:48:34 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-12-19 12:48:34 -0500 |
| commit | abc10262696e53773c9a8c9f279bbd464b464190 (patch) | |
| tree | 9626bc02f37b0e92549fc815f6bedbba7f9728b9 /src/backend/utils/adt/tsquery.c | |
| parent | dcb09b595f88a3bca6097a6acc17bf2ec935d55f (diff) | |
| download | postgresql-abc10262696e53773c9a8c9f279bbd464b464190.tar.gz postgresql-abc10262696e53773c9a8c9f279bbd464b464190.zip | |
Fix erroneous parsing of tsquery input "... & !(subexpression) | ..."
After parsing a parenthesized subexpression, we must pop all pending
ANDs and NOTs off the stack, just like the case for a simple operand.
Per bug #5793.
Also fix clones of this routine in contrib/intarray and contrib/ltree,
where input of types query_int and ltxtquery had the same problem.
Back-patch to all supported versions.
Diffstat (limited to 'src/backend/utils/adt/tsquery.c')
| -rw-r--r-- | src/backend/utils/adt/tsquery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index db9236a4741..a155c933e26 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -371,8 +371,8 @@ makepol(TSQueryParserState state, case PT_OPEN: makepol(state, pushval, opaque); - if (lenstack && (opstack[lenstack - 1] == OP_AND || - opstack[lenstack - 1] == OP_NOT)) + while (lenstack && (opstack[lenstack - 1] == OP_AND || + opstack[lenstack - 1] == OP_NOT)) { lenstack--; pushOperator(state, opstack[lenstack]); |