Fix possible use of uninitialised value in ts_headline()

feodor · feodor · commit 9d3fb209a076 · 2016-04-08T21:25:59.000+03:00
Found during investigation of failure of skink buildfarm member and its
valgrind report.

Backpatch to all supported branches
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
@@ -2439,6 +2439,8 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight,
 			}
 			else
 			{					/* shorter cover :((( */
+				if (i > q)
+					i = q;
 				for (; curlen > min_words; i--)
 				{
 					if (!NONWORDTOKEN(prs->words[i].type))

Original file line number	Diff line number	Diff line change
`@@ -2439,6 +2439,8 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight,`
`2439`	`2439`	`}`
`2440`	`2440`	`else`
`2441`	`2441`	`{ /* shorter cover :((( */`
	`2442`	`+ if (i > q)`
	`2443`	`+ i = q;`
`2442`	`2444`	`for (; curlen > min_words; i--)`
`2443`	`2445`	`{`
`2444`	`2446`	`if (!NONWORDTOKEN(prs->words[i].type))`