commit 4ad739fc053c1666d07ba1cf59be26cb1c3e52d7
author Bram Moolenaar <Bram@vim.org> Wed Sep 02 10:25:45 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Sep 02 10:25:45 2020 +0200
tree 66485dc142df679ab7c8091c2e6f14c7bc9608cb
parent 6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5

patch 8.2.1564: a few remaining errors from ubsan

Problem:    A few remaining errors from ubsan.
Solution:   Avoid the warnings. (Dominique Pellé, closes #6837)

src/spellsuggest.c

diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index 96e7bb6..e2423cd 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -3731,9 +3731,6 @@
     int		maxscore,
     int		keep)		// nr of suggestions to keep
 {
-    suggest_T   *stp = &SUG(*gap, 0);
-    int		i;
-
     if (gap->ga_len > 0)
     {
 	// Sort the list.
@@ -3744,6 +3741,9 @@
 	// displayed.
 	if (gap->ga_len > keep)
 	{
+	    int		i;
+	    suggest_T   *stp = &SUG(*gap, 0);
+
 	    for (i = keep; i < gap->ga_len; ++i)
 		vim_free(stp[i].st_word);
 	    gap->ga_len = keep;