diff options
| author | K.Takata <kentkt@csc.jp> | 2022-07-14 17:25:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-14 17:25:14 +0100 |
| commit | 2ebcc35826bc2deb04e5fc6d73332f55783e7f52 (patch) | |
| tree | ed74fb14bfee6ec533d72ddd532f57bbf5109ed3 | |
| parent | f754fe6a3d5384b5146c38a32db6da9d46e00c40 (diff) | |
| download | vim-git-2ebcc35826bc2deb04e5fc6d73332f55783e7f52.tar.gz | |
patch 9.0.0052: "zG" may throw an error if invalid character followsv9.0.0052
Problem: "zG" may throw an error if invalid character follows.
Solution: Pass the word length to valid_spell_word(). (Ken Takata,
closes #10737)
| -rw-r--r-- | src/spellfile.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_spell.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/spellfile.c b/src/spellfile.c index 4a0de5237..8120d75bf 100644 --- 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; diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index a291eb5c7..94ea3d7fe 100644 --- 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= diff --git a/src/version.c b/src/version.c index a6a80b671..3c4e96cf3 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 52, +/**/ 51, /**/ 50, |