Bugzilla

Description: Patch from comment #37

Filename:

MIME Type:

Creator: Ryan VanderMeulen [:RyanVM]

Size: 3.27 KB

patch

># HG changeset patch ># Parent d857e5c6fa2d01a6d3851526159bd36e20430937 ># User Németh László <nemeth@openoffice.org> >Bug 626195 - Hunspell topcrash [@ AffixMgr::suffix_check ]. r=ehsan, a2.0= > >diff --git a/extensions/spellcheck/hunspell/src/affixmgr.cpp b/extensions/spellcheck/hunspell/src/affixmgr.cpp >--- a/extensions/spellcheck/hunspell/src/affixmgr.cpp >+++ b/extensions/spellcheck/hunspell/src/affixmgr.cpp >@@ -2471,18 +2471,19 @@ struct hentry * AffixMgr::suffix_check ( > if (rv) { > sfx=se; // BUG: sfx not stateless > return rv; > } > } > } > se = se->getNext(); > } >- >+ > // now handle the general case >+ if (len == 0) return NULL; // FULLSTRIP > unsigned char sp = *((const unsigned char *)(word + len - 1)); > SfxEntry * sptr = sStart[sp]; > > while (sptr) { > if (isRevSubset(sptr->getKey(), word + len - 1, len) > ) { > // suffixes are not allowed in beginning of compounds > if ((((in_compound != IN_CPD_BEGIN)) || // && !cclass >@@ -2538,18 +2539,19 @@ struct hentry * AffixMgr::suffix_check_t > while (se) { > if (contclasses[se->getFlag()]) > { > rv = se->check_twosfx(word,len, sfxopts, ppfx, needflag); > if (rv) return rv; > } > se = se->getNext(); > } >- >+ > // now handle the general case >+ if (len == 0) return NULL; // FULLSTRIP > unsigned char sp = *((const unsigned char *)(word + len - 1)); > SfxEntry * sptr = sStart[sp]; > > while (sptr) { > if (isRevSubset(sptr->getKey(), word + len - 1, len)) { > if (contclasses[sptr->getFlag()]) > { > rv = sptr->check_twosfx(word,len, sfxopts, ppfx, needflag); >@@ -2600,18 +2602,19 @@ char * AffixMgr::suffix_check_twosfx_mor > mystrcat(result, " ", MAXLNLEN); > mystrcat(result, se->getMorph(), MAXLNLEN); > } else debugflag(result, se->getFlag()); > mystrcat(result, "\n", MAXLNLEN); > } > } > se = se->getNext(); > } >- >+ > // now handle the general case >+ if (len == 0) return NULL; // FULLSTRIP > unsigned char sp = *((const unsigned char *)(word + len - 1)); > SfxEntry * sptr = sStart[sp]; > > while (sptr) { > if (isRevSubset(sptr->getKey(), word + len - 1, len)) { > if (contclasses[sptr->getFlag()]) > { > st = sptr->check_twosfx_morph(word,len, sfxopts, ppfx, needflag); >@@ -2706,18 +2709,19 @@ char * AffixMgr::suffix_check_morph(cons > mystrcat(result, se->getMorph(), MAXLNLEN); > } else debugflag(result, se->getFlag()); > mystrcat(result, "\n", MAXLNLEN); > rv = se->get_next_homonym(rv, sfxopts, ppfx, cclass, needflag); > } > } > se = se->getNext(); > } >- >+ > // now handle the general case >+ if (len == 0) return NULL; // FULLSTRIP > unsigned char sp = *((const unsigned char *)(word + len - 1)); > SfxEntry * sptr = sStart[sp]; > > while (sptr) { > if (isRevSubset(sptr->getKey(), word + len - 1, len) > ) { > // suffixes are not allowed in beginning of compounds > if (((((in_compound != IN_CPD_BEGIN)) || // && !cclass

Flags:

ehsan.akhgari: review+
Gavin: approval2.0+
dveditz: approval1.9.2.17+