From: Heikki Linnakangas <heikki.linnakangas@iki.fi> Date: Tue, 15 May 2012 16:22:56 +0000 (+0300) Subject: Fix bug in to_tsquery(). X-Git-Tag: REL9_2_BETA2~76 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2495f272cd164ff075bee5c4ce95aed11338a36;p=postgresql Fix bug in to_tsquery(). We were using memcpy() to copy to a possibly overlapping memory region, which is a no-no. Use memmove() instead. --- diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index b92a5aa6e5..da9ae8d5ba 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -340,6 +340,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) if (query->size == 0) PG_RETURN_TSQUERY(query); + /* clean out any stopword placeholders from the tree */ res = clean_fakeval(GETQUERY(query), &len); if (!res) { @@ -349,6 +350,10 @@ to_tsquery_byid(PG_FUNCTION_ARGS) } memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem)); + /* + * Removing the stopword placeholders might've resulted in fewer + * QueryItems. If so, move the operands up accordingly. + */ if (len != query->size) { char *oldoperand = GETOPERAND(query); @@ -357,7 +362,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) Assert(len < query->size); query->size = len; - memcpy((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char *) query)); + memmove((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char *) query)); SET_VARSIZE(query, COMPUTESIZE(len, lenoperand)); }