diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/spellfile.c | 10 | ||||
| -rw-r--r-- | src/nvim/testdir/test_spell.vim | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c index 04eb9dd2bc..9d2fd2637d 100644 --- a/src/nvim/spellfile.c +++ b/src/nvim/spellfile.c @@ -3905,12 +3905,12 @@ static wordnode_T *wordtree_alloc(spellinfo_T *spin) /// Return true if "word" contains valid word characters. /// 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; } - 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)) { return false; } @@ -3939,7 +3939,7 @@ static int store_word(spellinfo_T *spin, char_u *word, int flags, int region, co int res = OK; // Avoid adding illegal bytes to the word tree. - if (!valid_spell_word(word)) { + if (!valid_spell_word(word, word + len)) { return FAIL; } @@ -5536,7 +5536,7 @@ void spell_add_word(char_u *word, int len, SpellAddType what, int idx, bool undo 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/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim index 58f0760f48..7744c5bcca 100644 --- a/src/nvim/testdir/test_spell.vim +++ b/src/nvim/testdir/test_spell.vim @@ -827,6 +827,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) throw 'skipped: Nvim does not support enc=latin1' set enc=latin1 |