patch 7.4.1936

Problem:    Off-by-one error in bounds check. (Coverity)
Solution:   Check register number properly.

diff --git a/src/ops.c b/src/ops.c
index 44cd47366d3034e8c7e9572d7c9c4131637b2d4b..d97107e229f24183dc4666be996bd344c5d1e0b4 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -6011,7 +6011,7 @@ handle_viminfo_register(garray_T *values, int force)
        return;
     flags = vp[0].bv_nr;
     name = vp[1].bv_nr;
-    if (name < 0 || name > NUM_REGISTERS)
+    if (name < 0 || name >= NUM_REGISTERS)
        return;
     type = vp[2].bv_nr;
     if (type != MCHAR && type != MLINE && type != MBLOCK)

diff --git a/src/version.c b/src/version.c
index 3e22c3812ed78edf3318b262a31175e695bee6d4..32e78cc235400b626bd0b34aec16d303169eaa60 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1936,
 /**/
     1935,
 /**/