mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 00:02:09 -04:00
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.
This commit is contained in:
parent
fb61ff85e1
commit
ff9d757c67
@ -127,20 +127,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
|
||||||
{
|
{
|
||||||
memcpy(cptr, ptr, sizeof(TSLexeme));
|
if (cptr != ptr)
|
||||||
|
memcpy(cptr, ptr, sizeof(TSLexeme));
|
||||||
cptr++;
|
cptr++;
|
||||||
ptr++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cptr->lexeme = NULL;
|
cptr->lexeme = NULL;
|
||||||
|
@ -125,7 +125,8 @@ 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++;
|
||||||
memcpy(res, ptr, sizeof(WordEntryIN));
|
if (res != ptr)
|
||||||
|
memcpy(res, ptr, sizeof(WordEntryIN));
|
||||||
}
|
}
|
||||||
else if (ptr->entry.haspos)
|
else if (ptr->entry.haspos)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user