Fix possible use of uninitialised value in ts_headline()

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
index cfd07fd4bf33599473bd71f807f0b499b39cf36c..6f117bdf648b0dd28ee5a10a62cc4c5df6773aa3 100644 (file)
--- 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))