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

vim-patch:9.0.0052: "zG" may throw an error if invalid character follows (#19368)

Browse Source 
Problem:    "zG" may throw an error if invalid character follows.
Solution:   Pass the word length to valid_spell_word(). (Ken Takata,
            closes vim/vim#10737)
2ebcc35826
This commit is contained in:
zeertzjq 2022-07-15 08:42:36 +08:00 committed by GitHub
parent 75ad050919
commit 072fb55cb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/spellfile.c
View File

@ -3905,12 +3905,12 @@ static wordnode_T *wordtree_alloc(spellinfo_T *spin)
/// Return true if "word" contains valid word characters. /// Return true if "word" contains valid word characters.
/// Control characters and trailing '/' are invalid. Space is OK. /// Control characters and trailing '/' are invalid. Space is OK.
static bool valid_spell_word(const char_u *word) static bool valid_spell_word(const char_u *word, const char_u *end)
{ {
if (!utf_valid_string(word, NULL)) { if (!utf_valid_string(word, end)) {
return false; return false;
} }
for (const char_u *p = word; *p != NUL; p += utfc_ptr2len((const char *)p)) { for (const char_u *p = word; *p != NUL && p < end; p += utfc_ptr2len((const char *)p)) {
if (*p < ' ' || (p[0] == '/' && p[1] == NUL)) { if (*p < ' ' || (p[0] == '/' && p[1] == NUL)) {
return false; return false;
} }
@ -3939,7 +3939,7 @@ static int store_word(spellinfo_T *spin, char_u *word, int flags, int region, co
int res = OK; int res = OK;
// Avoid adding illegal bytes to the word tree. // Avoid adding illegal bytes to the word tree.
if (!valid_spell_word(word)) { if (!valid_spell_word(word, word + len)) {
return FAIL; return FAIL;
} }
@ -5536,7 +5536,7 @@ void spell_add_word(char_u *word, int len, SpellAddType what, int idx, bool undo
int i; int i;
char_u *spf; char_u *spf;
if (!valid_spell_word(word)) { if (!valid_spell_word(word, word + len)) {
emsg(_(e_illegal_character_in_word)); emsg(_(e_illegal_character_in_word));
return; return;
} }

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

@ -827,6 +827,16 @@ func Test_spell_good_word_invalid()
bwipe! bwipe!
endfunc endfunc
func Test_spell_good_word_slash()
" This caused E1280.
new
norm afoo /
1
norm zG
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