From: Teodor Sigaev <teodor@sigaev.ru>
Date: Mon, 12 Feb 2007 14:15:13 +0000 (+0000)
Subject: Fix backend crash in parsing incorrect tsquery.
X-Git-Tag: REL8_2_4~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15f910da96b9a494fd673ef15639bc036b62d746;p=thirdparty%2Fpostgresql.git

Fix backend crash in parsing incorrect tsquery.

 Per report from Jon Rosebaugh <jon@inklesspen.com>
---

diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
index b832deb22e8..37f60caf1ad 100644
--- 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, ':'))