Use memmove() instead of memcpy() for copying overlapping regions.

In commit d2495f272cd164ff075bee5c4ce95aed11338a36, I fixed this bug in
to_tsquery(), but missed the fact that plainto_tsquery() has the same bug.

diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index fe9a43c1796f4b5c44bbf08cd7c31fe5fab7a72a..4342682bbaa65f97fe302c3f204e0a34c1fe949f 100644 (file)
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -398,6 +398,7 @@ plainto_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)
        {
@@ -407,6 +408,10 @@ plainto_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);
@@ -415,7 +420,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
                Assert(len < query->size);
 
                query->size = len;
-               memcpy((void *) GETOPERAND(query), oldoperand, lenoperand);
+               memmove((void *) GETOPERAND(query), oldoperand, lenoperand);
                SET_VARSIZE(query, COMPUTESIZE(len, lenoperand));
        }