summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-30 12:10:39 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-30 12:10:39 +0000
commit6970e1e36a1ecdb4d330d6ac9ca76f97fa515e36 (patch)
treee68fc4a39e6022910ad3effe0a1cf209840773f0
parentf10911e5db16f1fe6ab519c5d091ad0c1df0d063 (diff)
patch 8.2.4258: Coverity warns for array overrunv8.2.4258
Problem: Coverity warns for array overrun. Solution: Restrict depth to MAXWLEN - 1.
-rw-r--r--src/spellsuggest.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index 3cd45352fc..e21ac80ced 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 0d84d580af..a0f0037f74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4258,
+/**/
4257,
/**/
4256,