diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-25 13:55:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-25 13:55:24 +0100 |
| commit | 569fea2c312126dd5a542c4b1aa51095136a2c0d (patch) | |
| tree | 35082cea27c713fecdd8574f9b4b65eb6842d5e1 | |
| parent | e9a8d1f9adaf4599b5a7923f8db8e207ed6e7eca (diff) | |
| download | vim-git-569fea2c312126dd5a542c4b1aa51095136a2c0d.tar.gz | |
patch 8.2.0039: memory access error when "z=" has no suggestionsv8.2.0039
Problem: Memory access error when "z=" has no suggestions.
Solution: Check for negative index.
| -rw-r--r-- | src/spellsuggest.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_spell.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/spellsuggest.c b/src/spellsuggest.c index 9d6df7930..adf090bbe 100644 --- a/src/spellsuggest.c +++ b/src/spellsuggest.c @@ -3729,7 +3729,8 @@ cleanup_suggestions( for (i = keep; i < gap->ga_len; ++i) vim_free(stp[i].st_word); gap->ga_len = keep; - return stp[keep - 1].st_score; + if (keep >= 1) + return stp[keep - 1].st_score; } return maxscore; } diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index 091276b45..7080c203b 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -241,9 +241,7 @@ func Test_spellsuggest_option_number() \ .. "Type number and <Enter> or click with mouse (empty cancels): ", a) set spell spellsuggest=0 - " FIXME: the following line is currently commented out as it triggers a - " memory error detected in cleanup_suggestions() by asan or valgrind. - "call assert_equal("\nSorry, no suggestions", execute('norm z=')) + call assert_equal("\nSorry, no suggestions", execute('norm z=')) " Unlike z=, function spellsuggest(...) should not be affected by the " max number of suggestions (2) set by the 'spellsuggest' option. diff --git a/src/version.c b/src/version.c index e6f0cf0ab..9f7f48a38 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 39, +/**/ 38, /**/ 37, |