From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 30 Jan 2022 12:10:39 +0000 (+0000)
Subject: patch 8.2.4258: Coverity warns for array overrun
X-Git-Tag: v8.2.4258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6970e1e36a1ecdb4d330d6ac9ca76f97fa515e36;p=vim

patch 8.2.4258: Coverity warns for array overrun

Problem:    Coverity warns for array overrun.
Solution:   Restrict depth to MAXWLEN - 1.
---

diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index 3cd45352f..e21ac80ce 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -1214,7 +1214,7 @@ suggest_try_change(suginfo_T *su)
 
 // Check the maximum score, if we go over it we won't try this change.
 #define TRY_DEEPER(su, stack, depth, add) \
-	   (depth < MAXWLEN && stack[depth].ts_score + (add) < su->su_maxscore)
+       (depth < MAXWLEN - 1 && stack[depth].ts_score + (add) < su->su_maxscore)
 
 /*
  * Try finding suggestions by adding/removing/swapping letters.
@@ -1373,7 +1373,7 @@ suggest_trie_walk(
 
 		// At end of a prefix or at start of prefixtree: check for
 		// following word.
-		if (depth < MAXWLEN
+		if (depth < MAXWLEN - 1
 			    && (byts[arridx] == 0 || n == (int)STATE_NOPREFIX))
 		{
 		    // Set su->su_badflags to the caps type at this position.
diff --git a/src/version.c b/src/version.c
index 0d84d580a..a0f0037f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4258,
 /**/
     4257,
 /**/