mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid memcpy() with same source and destination address.

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

Found by running regression tests with Valgrind.
This commit is contained in:
Heikki Linnakangas 2014-03-07 13:13:33 +02:00
parent 2b8483d69d
commit ad7b48ea08
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/tsearch/dict_ispell.c
View File

@ -126,20 +126,19 @@ dispell_lexize(PG_FUNCTION_ARGS)
if (res == NULL) if (res == NULL)
PG_RETURN_POINTER(NULL); PG_RETURN_POINTER(NULL);
ptr = cptr = res; cptr = res;
while (ptr->lexeme) for (ptr = cptr; ptr->lexeme; ptr++)
{ {
if (searchstoplist(&(d->stoplist), ptr->lexeme)) if (searchstoplist(&(d->stoplist), ptr->lexeme))
{ {
pfree(ptr->lexeme); pfree(ptr->lexeme);
ptr->lexeme = NULL; ptr->lexeme = NULL;
ptr++;
} }
else else
{ {
if (cptr != ptr)
memcpy(cptr, ptr, sizeof(TSLexeme)); memcpy(cptr, ptr, sizeof(TSLexeme));
cptr++; cptr++;
ptr++;
} }
} }
cptr->lexeme = NULL; cptr->lexeme = NULL;

1
src/backend/utils/adt/tsvector.c
View File

@ -124,6 +124,7 @@ uniqueentry(WordEntryIN *a, int l, char *buf, int *outbuflen)
buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16); buflen += res->poslen * sizeof(WordEntryPos) + sizeof(uint16);
} }
res++; res++;
if (res != ptr)
memcpy(res, ptr, sizeof(WordEntryIN)); memcpy(res, ptr, sizeof(WordEntryIN));
} }
else if (ptr->entry.haspos) else if (ptr->entry.haspos)