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:34 +0300 |
| commit | d2495f272cd164ff075bee5c4ce95aed11338a36 (patch) | |
| tree | e87b769657b4ad8130fecffab24dfc901a4e28f8 | |
| parent | 9b63e9869ffaa4d6d3e8bf45086a765d8f310f1c (diff) | |
| download | postgresql-d2495f272cd164ff075bee5c4ce95aed11338a36.tar.gz postgresql-d2495f272cd164ff075bee5c4ce95aed11338a36.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.
| -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 b92a5aa6e5d..da9ae8d5ba8 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -340,6 +340,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) { @@ -349,6 +350,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); @@ -357,7 +362,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)); } |