Mercurial > vim
changeset 29421:61796d98c856 v9.0.0052
patch 9.0.0052: "zG" may throw an error if invalid character follows
Commit: https://github.com/vim/vim/commit/2ebcc35826bc2deb04e5fc6d73332f55783e7f52
Author: K.Takata <kentkt@csc.jp>
Date: Thu Jul 14 17:25:14 2022 +0100
patch 9.0.0052: "zG" may throw an error if invalid character follows
Problem: "zG" may throw an error if invalid character follows.
Solution: Pass the word length to valid_spell_word(). (Ken Takata,
closes #10737)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 14 Jul 2022 18:30:04 +0200 |
| parents | 7268e2e2e45b |
| children | e53620f59deb |
| files | src/spellfile.c src/testdir/test_spell.vim src/version.c |
| diffstat | 3 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/spellfile.c +++ b/src/spellfile.c @@ -4371,13 +4371,13 @@ wordtree_alloc(spellinfo_T *spin) * Control characters and trailing '/' are invalid. Space is OK. */ static int -valid_spell_word(char_u *word) +valid_spell_word(char_u *word, char_u *end) { char_u *p; - if (enc_utf8 && !utf_valid_string(word, NULL)) + if (enc_utf8 && !utf_valid_string(word, end)) return FALSE; - for (p = word; *p != NUL; p += mb_ptr2len(p)) + for (p = word; *p != NUL && p < end; p += mb_ptr2len(p)) if (*p < ' ' || (p[0] == '/' && p[1] == NUL)) return FALSE; return TRUE; @@ -4408,7 +4408,7 @@ store_word( char_u *p; // Avoid adding illegal bytes to the word tree. - if (!valid_spell_word(word)) + if (!valid_spell_word(word, word + len)) return FAIL; (void)spell_casefold(curwin, word, len, foldword, MAXWLEN); @@ -6211,7 +6211,7 @@ spell_add_word( int i; char_u *spf; - if (!valid_spell_word(word)) + if (!valid_spell_word(word, word + len)) { emsg(_(e_illegal_character_in_word)); return;
--- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -884,6 +884,16 @@ func Test_spell_good_word_invalid() bwipe! endfunc +func Test_spell_good_word_slash() + " This caused E1280. + new + norm afoo / + 1 + norm zG + + bwipe! +endfunc + func LoadAffAndDic(aff_contents, dic_contents) set enc=latin1 set spellfile=