1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in to_tsquery().

Browse Source 
We were using memcpy() to copy to a possibly overlapping memory region,
which is a no-no. Use memmove() instead.
This commit is contained in:
Heikki Linnakangas 2012-05-15 19:22:56 +03:00
parent fcc0ba313b
commit 5761556250
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

@ -342,6 +342,7 @@ to_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)
{ {
@ -351,6 +352,10 @@ to_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);
int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query); int4 lenoperand = VARSIZE(query) - (oldoperand - (char*)query);
@ -358,7 +363,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
Assert( len < query->size ); Assert( len < query->size );
query->size = len; query->size = len;
memcpy((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char*)query) ); memmove((void *) GETOPERAND(query), oldoperand, VARSIZE(query) - (oldoperand - (char*)query) );
SET_VARSIZE(query, COMPUTESIZE( len, lenoperand )); SET_VARSIZE(query, COMPUTESIZE( len, lenoperand ));
} }