IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17988 from zeertzjq/vim-8.2.4247

Browse Source 
vim-patch:8.2.{4247,4258}: stack corruption when looking for spell suggestions
This commit is contained in:
zeertzjq 2022-04-04 11:11:37 +08:00 committed by GitHub
commit db13f105d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/spell.c
View File

@ -3690,7 +3690,7 @@ static void suggest_try_change(suginfo_T *su)
// Check the maximum score, if we go over it we won't try this change. // Check the maximum score, if we go over it we won't try this change.
#define TRY_DEEPER(su, stack, depth, add) \ #define TRY_DEEPER(su, stack, depth, add) \
(stack[depth].ts_score + (add) < su->su_maxscore) ((depth) < MAXWLEN - 1 && (stack)[depth].ts_score + (add) < (su)->su_maxscore)
// Try finding suggestions by adding/removing/swapping letters. // Try finding suggestions by adding/removing/swapping letters.
// //
@ -3794,6 +3794,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
} }
} }
// The loop may take an indefinite amount of time. Break out after five
// sectonds. TODO(vim): add an option for the time limit.
proftime_T time_limit = profile_setlimit(5000);
// Loop to find all suggestions. At each round we either: // Loop to find all suggestions. At each round we either:
// - For the current state try one operation, advance "ts_curi", // - For the current state try one operation, advance "ts_curi",
// increase "depth". // increase "depth".
@ -3824,7 +3828,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// At end of a prefix or at start of prefixtree: check for // At end of a prefix or at start of prefixtree: check for
// following word. // following word.
if (byts[arridx] == 0 || n == STATE_NOPREFIX) { if (depth < MAXWLEN - 1 && (byts[arridx] == 0 || n == STATE_NOPREFIX)) {
// Set su->su_badflags to the caps type at this position. // Set su->su_badflags to the caps type at this position.
// Use the caps type until here for the prefix itself. // Use the caps type until here for the prefix itself.
n = nofold_len(fword, sp->ts_fidx, su->su_badptr); n = nofold_len(fword, sp->ts_fidx, su->su_badptr);
@ -4927,6 +4931,9 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (--breakcheckcount == 0) { if (--breakcheckcount == 0) {
os_breakcheck(); os_breakcheck();
breakcheckcount = 1000; breakcheckcount = 1000;
if (profile_passed_limit(time_limit)) {
got_int = true;
}
} }
} }
} }

12
src/nvim/testdir/test_spell.vim
View File

@ -407,7 +407,7 @@ func Test_zz_basic()
\ ) \ )
call assert_equal("gebletegek", soundfold('goobledygoook')) call assert_equal("gebletegek", soundfold('goobledygoook'))
call assert_equal("kepereneven", 'kóopërÿnôven'->soundfold()) call assert_equal("kepereneven", 'kóopërÿnôven'->soundfold())
call assert_equal("everles gesvets etele", soundfold('oeverloos gezwets edale')) call assert_equal("everles gesvets etele", soundfold('oeverloos gezwets edale'))
endfunc endfunc
@ -588,7 +588,7 @@ func Test_zz_sal_and_addition()
mkspell! Xtest Xtest mkspell! Xtest Xtest
set spl=Xtest.latin1.spl spell set spl=Xtest.latin1.spl spell
call assert_equal('kbltykk', soundfold('goobledygoook')) call assert_equal('kbltykk', soundfold('goobledygoook'))
call assert_equal('kprnfn', soundfold('kóopërÿnôven')) call assert_equal('kprnfn', soundfold('kóopërÿnôven'))
call assert_equal('*fls kswts tl', soundfold('oeverloos gezwets edale')) call assert_equal('*fls kswts tl', soundfold('oeverloos gezwets edale'))
"also use an addition file "also use an addition file
@ -681,6 +681,14 @@ func Test_spell_long_word()
set nospell set nospell
endfunc endfunc
func Test_spellsuggest_too_deep()
" This was incrementing "depth" over MAXWLEN.
new
norm s000G00ý000000000000
sil norm ..vzG................vvzG0 v z=
bwipe!
endfunc
func LoadAffAndDic(aff_contents, dic_contents) func LoadAffAndDic(aff_contents, dic_contents)
throw 'skipped: Nvim does not support enc=latin1' throw 'skipped: Nvim does not support enc=latin1'
set enc=latin1 set enc=latin1