fix-to_tsquery_overlapping-memcpy.patch
text/x-diff
Filename: fix-to_tsquery_overlapping-memcpy.patch
Type: text/x-diff
Part: 0
Message:
Bug in to_tsquery(), and fix
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: unified
| File | + | − |
|---|---|---|
| src/backend/tsearch/to_tsany.c | 6 | 1 |
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 5284c9c..9c5b3a3 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));
}