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 bb886ee5849fb52246f7a1de94a1c79c057f5e11..10be08f66293a1e5f50f9559d768b9ea01b2de0f 100644 (file)
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -396,6 +396,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)
    {
@@ -405,6 +406,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);
@@ -413,7 +418,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));
    }