diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-02-10 09:55:14 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2014-02-10 10:00:23 +0200 |
| commit | 5f778e6444c87948c84099754e23f6e1cff759fa (patch) | |
| tree | 0ca489591678eeb1e9c41c274ec248ab9e53a893 /src | |
| parent | c6e5c4dd1d9ba2abb7970c9dc920ecaf43837435 (diff) | |
| download | postgresql-5f778e6444c87948c84099754e23f6e1cff759fa.tar.gz postgresql-5f778e6444c87948c84099754e23f6e1cff759fa.zip | |
Use memmove() instead of memcpy() for copying overlapping regions.
In commit d2495f272cd164ff075bee5c4ce95aed11338a36, I fixed this bug in
to_tsquery(), but missed the fact that plainto_tsquery() has the same bug.
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 9c5b3a361af..81630982007 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -398,6 +398,7 @@ plainto_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) { @@ -407,6 +408,10 @@ plainto_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); @@ -415,7 +420,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS) Assert(len < query->size); query->size = len; - memcpy((void *) GETOPERAND(query), oldoperand, lenoperand); + memmove((void *) GETOPERAND(query), oldoperand, lenoperand); SET_VARSIZE(query, COMPUTESIZE(len, lenoperand)); } |