Commit26d73dd

committed

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.

1 parent82992a4 commit26d73ddCopy full SHA for 26d73dd

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)`
`342`	`342`	`if (query->size==0)`
`343`	`343`	`PG_RETURN_TSQUERY(query);`
`344`	`344`
	`345`	`+/* clean out any stopword placeholders from the tree */`
`345`	`346`	`res=clean_fakeval(GETQUERY(query),&len);`
`346`	`347`	`if (!res)`
`347`	`348`	`{`
`@@ -351,6 +352,10 @@ to_tsquery_byid(PG_FUNCTION_ARGS)`
`351`	`352`	`}`
`352`	`353`	`memcpy((void)GETQUERY(query), (void)res,len*sizeof(QueryItem));`
`353`	`354`
	`355`	`+/*`
	`356`	`+ * Removing the stopword placeholders might've resulted in fewer`
	`357`	`+ * QueryItems. If so, move the operands up accordingly.`
	`358`	`+ */`
`354`	`359`	`if (len!=query->size)`
`355`	`360`	`{`
`356`	`361`	`char*oldoperand=GETOPERAND(query);`
`@@ -359,7 +364,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)`
`359`	`364`	`Assert(len<query->size);`
`360`	`365`
`361`	`366`	`query->size=len;`
`362`		`-memcpy((void)GETOPERAND(query),oldoperand,VARSIZE(query)- (oldoperand- (char)query));`
	`367`	`+memmove((void)GETOPERAND(query),oldoperand,VARSIZE(query)- (oldoperand- (char)query));`
`363`	`368`	`SET_VARSIZE(query,COMPUTESIZE(len,lenoperand));`
`364`	`369`	`}`
`365`	`370`

Comments

(0)