Avoid memcpy() with same source and destination address.

hlinnaka · hlinnaka · commit c7a186e392d4 · 2014-03-07T13:29:47.000+02:00
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
@@ -128,20 +128,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
@@ -125,7 +125,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)
 		{

Original file line number	Diff line number	Diff line change
`@@ -128,20 +128,19 @@ dispell_lexize(PG_FUNCTION_ARGS)`
`128`	`128`	`if (res == NULL)`
`129`	`129`	`PG_RETURN_POINTER(NULL);`
`130`	`130`
`131`		`- ptr = cptr = res;`
`132`		`- while (ptr->lexeme)`
	`131`	`+ cptr = res;`
	`132`	`+ for (ptr = cptr; ptr->lexeme; ptr++)`
`133`	`133`	`{`
`134`	`134`	`if (searchstoplist(&(d->stoplist), ptr->lexeme))`
`135`	`135`	`{`
`136`	`136`	`pfree(ptr->lexeme);`
`137`	`137`	`ptr->lexeme = NULL;`
`138`		`- ptr++;`
`139`	`138`	`}`
`140`	`139`	`else`
`141`	`140`	`{`
`142`		`- memcpy(cptr, ptr, sizeof(TSLexeme));`
	`141`	`+ if (cptr != ptr)`
	`142`	`+ memcpy(cptr, ptr, sizeof(TSLexeme));`
`143`	`143`	`cptr++;`
`144`		`- ptr++;`
`145`	`144`	`}`
`146`	`145`	`}`
`147`	`146`	`cptr->lexeme = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ uniqueentry(WordEntryIN a, int l, char buf, int *outbuflen)`
`125`	`125`	`buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16);`
`126`	`126`	`}`
`127`	`127`	`res++;`
`128`		`- memcpy(res, ptr, sizeof(WordEntryIN));`
	`128`	`+ if (res != ptr)`
	`129`	`+ memcpy(res, ptr, sizeof(WordEntryIN));`
`129`	`130`	`}`
`130`	`131`	`else if (ptr->entry.haspos)`
`131`	`132`	`{`