From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 14 Jun 2016 19:32:28 +0000 (+0200)
Subject: patch 7.4.1936
X-Git-Tag: v7.4.1936
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e3720a9ddd8a9d2e8344358c28fa1f4196db0d;p=thirdparty%2Fvim.git

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 44cd47366d..d97107e229 100644
--- 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 3e22c3812e..32e78cc235 100644
--- 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,
 /**/