fix hlfinditem function. Thanks to "Stphane Bidoul" <stephane.bidoul@softwareag.com>.

feodor · feodor · commit 0b1ee9b5a3b5 · 2003-09-22T13:32:33.000Z
The 'word' variable there is initialised from
the prs-&gt;words array, but immediately after,
that array may be reallocated, thus leaving
word pointing to unallocated memory.
diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out
@@ -2056,11 +2056,11 @@ An hour of storm to place
 The sculpture of these granite seams,
 Upon a woman s face. E.  J.  Pratt  (1882 1964)
 ', to_tsquery('granite&sea'));
-                                           headline                                           
-----------------------------------------------------------------------------------------------
- <b>sea</b> an hour one night
-An hour of storm to place
-The sculpture of these <b>granite</b>
+                                             headline                                             
+--------------------------------------------------------------------------------------------------
+ <b>sea</b> a thousand years,
+A thousand years to trace
+The <b>granite</b> features of this cliff
 (1 row)
 
  
diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
@@ -360,14 +360,15 @@ hlfinditem(HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int buflen)
 {
 	int			i;
 	ITEM	   *item = GETQUERY(query);
-	HLWORD	   *word = &(prs->words[prs->curwords - 1]);
+	HLWORD	   *word;
 
 	while (prs->curwords + query->size >= prs->lenwords)
 	{
 		prs->lenwords *= 2;
 		prs->words = (HLWORD *) repalloc((void *) prs->words, prs->lenwords * sizeof(HLWORD));
 	}
 
+	word = &(prs->words[prs->curwords - 1]);
 	for (i = 0; i < query->size; i++)
 	{
 		if (item->type == VAL && item->length == buflen && strncmp(GETOPERAND(query) + item->distance, buf, buflen) == 0)

Original file line number	Diff line number	Diff line change
`@@ -360,14 +360,15 @@ hlfinditem(HLPRSTEXT * prs, QUERYTYPE * query, char *buf, int buflen)`
`360`	`360`	`{`
`361`	`361`	`int i;`
`362`	`362`	`ITEM *item = GETQUERY(query);`
`363`		`- HLWORD *word = &(prs->words[prs->curwords - 1]);`
	`363`	`+ HLWORD *word;`
`364`	`364`
`365`	`365`	`while (prs->curwords + query->size >= prs->lenwords)`
`366`	`366`	`{`
`367`	`367`	`prs->lenwords *= 2;`
`368`	`368`	`prs->words = (HLWORD ) repalloc((void ) prs->words, prs->lenwords * sizeof(HLWORD));`
`369`	`369`	`}`
`370`	`370`
	`371`	`+ word = &(prs->words[prs->curwords - 1]);`
`371`	`372`	`for (i = 0; i < query->size; i++)`
`372`	`373`	`{`
`373`	`374`	`if (item->type == VAL && item->length == buflen && strncmp(GETOPERAND(query) + item->distance, buf, buflen) == 0)`