Commit d2495f27 authored by Heikki Linnakangas's avatar Heikki Linnakangas

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.
parent 9b63e986
...@@ -340,6 +340,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) ...@@ -340,6 +340,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
if (query->size == 0) if (query->size == 0)
PG_RETURN_TSQUERY(query); PG_RETURN_TSQUERY(query);
/* clean out any stopword placeholders from the tree */
res = clean_fakeval(GETQUERY(query), &len); res = clean_fakeval(GETQUERY(query), &len);
if (!res) if (!res)
{ {
...@@ -349,6 +350,10 @@ to_tsquery_byid(PG_FUNCTION_ARGS) ...@@ -349,6 +350,10 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
} }
memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem)); 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) if (len != query->size)
{ {
char *oldoperand = GETOPERAND(query); char *oldoperand = GETOPERAND(query);
...@@ -357,7 +362,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) ...@@ -357,7 +362,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
Assert(len < query->size); Assert(len < query->size);
query->size = len; 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)); SET_VARSIZE(query, COMPUTESIZE(len, lenoperand));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment