Fix backend crash in parsing incorrect tsquery.

feodor · feodor · commit 44655290ccc1 · 2007-02-12T14:14:33.000Z
Per report from Jon Rosebaugh &lt;jon@inklesspen.com&gt;
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
@@ -159,12 +159,14 @@ gettoken_query(QPRS_STATE * state, int4 *val, int4 *lenval, char **strval, int2
 					(state->buf)++;		/* can safely ++, t_iseq guarantee
 										 * that pg_mblen()==1 */
 					*val = (int4) '!';
+					state->state = WAITOPERAND;
 					return OPR;
 				}
 				else if (t_iseq(state->buf, '('))
 				{
 					state->count++;
 					(state->buf)++;
+					state->state = WAITOPERAND;
 					return OPEN;
 				}
 				else if (t_iseq(state->buf, ':'))

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,14 @@ gettoken_query(QPRS_STATE * state, int4 val, int4 lenval, char **strval, int2`
`159`	`159`	`(state->buf)++; /* can safely ++, t_iseq guarantee`
`160`	`160`	`* that pg_mblen()==1 */`
`161`	`161`	`*val = (int4) '!';`
	`162`	`+ state->state = WAITOPERAND;`
`162`	`163`	`return OPR;`
`163`	`164`	`}`
`164`	`165`	`else if (t_iseq(state->buf, '('))`
`165`	`166`	`{`
`166`	`167`	`state->count++;`
`167`	`168`	`(state->buf)++;`
	`169`	`+ state->state = WAITOPERAND;`
`168`	`170`	`return OPEN;`
`169`	`171`	`}`
`170`	`172`	`else if (t_iseq(state->buf, ':'))`