Avoid memcpy() with same source and destination address.

The behavior of that is undefined, although unlikely to lead to problems in
practice.

Found by running regression tests with Valgrind.

diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c
index 425b810d055aa1641fb10954cea9d9ec3f3db4df..5cca3b64f0d971f92afee0706feecc8ea7552a51 100644 (file)
--- a/src/backend/tsearch/dict_ispell.c
+++ b/src/backend/tsearch/dict_ispell.c
@@ -126,20 +126,19 @@ dispell_lexize(PG_FUNCTION_ARGS)
        if (res == NULL)
                PG_RETURN_POINTER(NULL);
 
-       ptr = cptr = res;
-       while (ptr->lexeme)
+       cptr = res;
+       for (ptr = cptr; ptr->lexeme; ptr++)
        {
                if (searchstoplist(&(d->stoplist), ptr->lexeme))
                {
                        pfree(ptr->lexeme);
                        ptr->lexeme = NULL;
-                       ptr++;
                }
                else
                {
-                       memcpy(cptr, ptr, sizeof(TSLexeme));
+                       if (cptr != ptr)
+                               memcpy(cptr, ptr, sizeof(TSLexeme));
                        cptr++;
-                       ptr++;
                }
        }
        cptr->lexeme = NULL;

diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
index fc8a318da3cee55b0e45822f1bb20f44cc258295..609b0721bef42b1c33e025984b305f3286ad6f8f 100644 (file)
--- a/src/backend/utils/adt/tsvector.c
+++ b/src/backend/utils/adt/tsvector.c
@@ -124,7 +124,8 @@ uniqueentry(WordEntryIN *a, int l, char *buf, int *outbuflen)
                                buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16);
                        }
                        res++;
-                       memcpy(res, ptr, sizeof(WordEntryIN));
+                       if (res != ptr)
+                               memcpy(res, ptr, sizeof(WordEntryIN));
                }
                else if (ptr->entry.haspos)
                {