# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1577278804 -3600
# Node ID 305a7a8d9d4b354266864404340f463a40c2de9b
# Parent  5d4ff09e5a11df8c8c3a4b4343fbf44deaaa7a38
patch 8.2.0039: memory access error when "z=" has no suggestions

Commit: https://github.com/vim/vim/commit/569fea2c312126dd5a542c4b1aa51095136a2c0d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Dec 25 13:55:24 2019 +0100

    patch 8.2.0039: memory access error when "z=" has no suggestions

    Problem:    Memory access error when "z=" has no suggestions.
    Solution:   Check for negative index.

diff --git a/src/spellsuggest.c b/src/spellsuggest.c
--- 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
--- 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
--- 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,