postgres.git / summary / log / commit / refs

commit    d1eee9ba85be978c5b137d657dc8e3fd7bc2cebd
Author:   Teodor Sigaev <teodor@sigaev.ru>
Date:     Fri Apr 08 18:26:12 2016 +0000

    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


 src/backend/tsearch/wparser_def.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index 0648ec692e8..edebc2be20d 100644
--- 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))


[parent: 9e77d0e3cf83]