database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

Use memmove() instead of memcpy() for copying overlapping regions.

Browse Source 
In commit d2495f272cd164ff075bee5c4ce95aed11338a36, I fixed this bug in
to_tsquery(), but missed the fact that plainto_tsquery() has the same bug.
This commit is contained in:
Heikki Linnakangas 2014-02-10 09:55:14 +02:00
parent c6e5c4dd1d
commit 5f778e6444
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,6 +398,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
if (query->size == 0) if (query->size == 0)
PG_RETURN_TSQUERY(query); PG_RETURN_TSQUERY(query);
/* clean out any stopword placeholders from the tree */
res = clean_fakeval(GETQUERY(query), &len); res = clean_fakeval(GETQUERY(query), &len);
if (!res) if (!res)
{ {
@ -407,6 +408,10 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
} }
memcpy((void *) GETQUERY(query), (void *) res, len * sizeof(QueryItem)); 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) if (len != query->size)
{ {
char *oldoperand = GETOPERAND(query); char *oldoperand = GETOPERAND(query);
@ -415,7 +420,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
Assert(len < query->size); Assert(len < query->size);
query->size = len; query->size = len;
memcpy((void *) GETOPERAND(query), oldoperand, lenoperand); memmove((void *) GETOPERAND(query), oldoperand, lenoperand);
SET_VARSIZE(query, COMPUTESIZE(len, lenoperand)); SET_VARSIZE(query, COMPUTESIZE(len, lenoperand));
} }