Fix bogus affix-merging code.

tglsfdc · tglsfdc · commit 65a69dfa08e2 · 2018-04-12T18:39:51.000-04:00
NISortAffixes() compared successive compound affixes incorrectly, thus possibly failing to merge identical affixes, or (less likely) merging ones that shouldn't be merged. The user-visible effects of this are unclear, to me anyway. Per bug #15150 from Alexander Lakhin. It's been broken for a long time, so back-patch to all supported branches. Arthur Zakirov Discussion: https://postgr.es/m/152353327780.31225.13445405496721177988@wrigleys.postgresql.org
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
@@ -1963,16 +1963,18 @@ NISortAffixes(IspellDict *Conf)
 		if ((Affix->flagflags & FF_COMPOUNDFLAG) && Affix->replen > 0 &&
 			isAffixInUse(Conf, Affix->flag))
 		{
+			bool		issuffix = (Affix->type == FF_SUFFIX);
+
 			if (ptr == Conf->CompoundAffix ||
-				ptr->issuffix != (ptr - 1)->issuffix ||
+				issuffix != (ptr - 1)->issuffix ||
 				strbncmp((const unsigned char *) (ptr - 1)->affix,
 						 (const unsigned char *) Affix->repl,
 						 (ptr - 1)->len))
 			{
 				/* leave only unique and minimals suffixes */
 				ptr->affix = Affix->repl;
 				ptr->len = Affix->replen;
-				ptr->issuffix = (Affix->type == FF_SUFFIX);
+				ptr->issuffix = issuffix;
 				ptr++;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1963,16 +1963,18 @@ NISortAffixes(IspellDict *Conf)`
`1963`	`1963`	`if ((Affix->flagflags & FF_COMPOUNDFLAG) && Affix->replen > 0 &&`
`1964`	`1964`	`isAffixInUse(Conf, Affix->flag))`
`1965`	`1965`	`{`
	`1966`	`+ bool issuffix = (Affix->type == FF_SUFFIX);`
	`1967`	`+`
`1966`	`1968`	`if (ptr == Conf->CompoundAffix \|\|`
`1967`		`- ptr->issuffix != (ptr - 1)->issuffix \|\|`
	`1969`	`+ issuffix != (ptr - 1)->issuffix \|\|`
`1968`	`1970`	`strbncmp((const unsigned char *) (ptr - 1)->affix,`
`1969`	`1971`	`(const unsigned char *) Affix->repl,`
`1970`	`1972`	`(ptr - 1)->len))`
`1971`	`1973`	`{`
`1972`	`1974`	`/* leave only unique and minimals suffixes */`
`1973`	`1975`	`ptr->affix = Affix->repl;`
`1974`	`1976`	`ptr->len = Affix->replen;`
`1975`		`- ptr->issuffix = (Affix->type == FF_SUFFIX);`
	`1977`	`+ ptr->issuffix = issuffix;`
`1976`	`1978`	`ptr++;`
`1977`	`1979`	`}`
`1978`	`1980`	`}`