Fix core dump of ispell for case of non-successfull initialization.

feodor · feodor · commit 6cd9a58480e3 · 2006-12-04T09:26:57.000Z
Previous versions aren't affected.

Fix synonym dictionary init: string should be malloc'ed, not palloc'ed. Bug
introduced recently while fixing lowerstr().
diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_syn.c,v 1.10 2006/11/20 14:03:30 teodor Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/dict_syn.c,v 1.11 2006/12/04 09:26:57 teodor Exp $ */
 
 /*
  * ISpell interface
@@ -132,8 +132,8 @@ syn_init(PG_FUNCTION_ARGS)
 			continue;
 		*end = '\0';
 
-		d->syn[cur].in = lowerstr(starti);
-		d->syn[cur].out = lowerstr(starto);
+		d->syn[cur].in = strdup(lowerstr(starti));
+		d->syn[cur].out = strdup(lowerstr(starto));
 		if (!(d->syn[cur].in && d->syn[cur].out))
 		{
 			fclose(fin);
diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
@@ -1528,7 +1528,7 @@ NIFree(IspellDict * Conf)
 	if (Conf->Spell)
 	{
 		for (i = 0; i < Conf->nspell; i++)
-			pfree(Conf->Spell[i]->word);
+			pfree(Conf->Spell[i]);
 		pfree(Conf->Spell);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,7 @@ NIFree(IspellDict * Conf)`
`1528`	`1528`	`if (Conf->Spell)`
`1529`	`1529`	`{`
`1530`	`1530`	`for (i = 0; i < Conf->nspell; i++)`
`1531`		`- pfree(Conf->Spell[i]->word);`
	`1531`	`+ pfree(Conf->Spell[i]);`
`1532`	`1532`	`pfree(Conf->Spell);`
`1533`	`1533`	`}`
`1534`	`1534`