Fix possible use of uninitialised value in ts_headline()

feodor · feodor · commit cb0c8cbf316f · 2016-04-08T21:25:14.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
@@ -2465,6 +2465,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
`@@ -2465,6 +2465,8 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight,`
`2465`	`2465`	`}`
`2466`	`2466`	`else`
`2467`	`2467`	`{ /* shorter cover :((( */`
	`2468`	`+ if (i > q)`
	`2469`	`+ i = q;`
`2468`	`2470`	`for (; curlen > min_words; i--)`
`2469`	`2471`	`{`
`2470`	`2472`	`if (!NONWORDTOKEN(prs->words[i].type))`