mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix erroneous parsing of tsquery input "... & !(subexpression) | ..."

Browse Source 
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.
This commit is contained in:
Tom Lane 2010-12-19 12:48:48 -05:00
parent 2bb6050c45
commit 15884d494e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/intarray/_int_bool.c
View File

@ -196,8 +196,8 @@ makepol(WORKSTATE *state)
case OPEN: case OPEN:
if (makepol(state) == ERR) if (makepol(state) == ERR)
return ERR; return ERR;
if (lenstack && (stack[lenstack - 1] == (int4) '&' || while (lenstack && (stack[lenstack - 1] == (int4) '&' ||
stack[lenstack - 1] == (int4) '!')) stack[lenstack - 1] == (int4) '!'))
{ {
lenstack--; lenstack--;
pushquery(state, OPR, stack[lenstack]); pushquery(state, OPR, stack[lenstack]);

4
contrib/ltree/ltxtquery_io.c
View File

@ -241,8 +241,8 @@ makepol(QPRS_STATE *state)
case OPEN: case OPEN:
if (makepol(state) == ERR) if (makepol(state) == ERR)
return ERR; return ERR;
if (lenstack && (stack[lenstack - 1] == (int4) '&' || while (lenstack && (stack[lenstack - 1] == (int4) '&' ||
stack[lenstack - 1] == (int4) '!')) stack[lenstack - 1] == (int4) '!'))
{ {
lenstack--; lenstack--;
pushquery(state, OPR, stack[lenstack], 0, 0, 0); pushquery(state, OPR, stack[lenstack], 0, 0, 0);

4
src/backend/utils/adt/tsquery.c
View File

@ -371,8 +371,8 @@ makepol(TSQueryParserState state,
case PT_OPEN: case PT_OPEN:
makepol(state, pushval, opaque); makepol(state, pushval, opaque);
if (lenstack && (opstack[lenstack - 1] == OP_AND || while (lenstack && (opstack[lenstack - 1] == OP_AND ||
opstack[lenstack - 1] == OP_NOT)) opstack[lenstack - 1] == OP_NOT))
{ {
lenstack--; lenstack--;
pushOperator(state, opstack[lenstack]); pushOperator(state, opstack[lenstack]);