From 6c2744f1d3a0d2e456f8d52776c976da3eb8d3a0 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 10 Feb 2014 09:55:14 +0200
Subject: [PATCH] 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.
---
src/backend/tsearch/to_tsany.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 030b0095cca..18024cc7a28 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -396,6 +396,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)
{
@@ -405,6 +406,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);
@@ -413,7 +418,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));
}
--
GitLab