diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-05-15 19:22:56 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2012-05-15 19:27:26 +0300 |
| commit | 435a1437961d72c98a1dbd27c8a9fb75024730f9 (patch) | |
| tree | 36f0e748a658e69d8346709d75ead08999f06a5e /src | |
| parent | 69c058ffc8949c6d86240b096196c4b6b64d87e0 (diff) | |
| download | postgresql-435a1437961d72c98a1dbd27c8a9fb75024730f9.tar.gz postgresql-435a1437961d72c98a1dbd27c8a9fb75024730f9.zip | |
Fix bug in to_tsquery().
We were using memcpy() to copy to a possibly overlapping memory region,
which is a no-no. Use memmove() instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tsearch/to_tsany.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index 5284c9c7149..9c5b3a361af 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -342,6 +342,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) if (query->size == 0) PG_RETURN_TSQUERY(query); + /* clean out any stopword placeholders from the tree */ res = clean_fakeval(GETQUERY(query), &len); if (!res) { @@ -351,6 +352,10 @@ to_tsquery_byid(PG_FUNCTION_ARGS) } 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) { char *oldoperand = GETOPERAND(query); @@ -359,7 +364,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS) Assert(len < query->size); 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)); } |