summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-14 21:32:28 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-14 21:32:28 +0200
commit67e3720a9ddd8a9d2e8344358c28fa1f4196db0d (patch)
tree358f2dcc64cb3c46807924021ad7ce2ffe622403
parentbee666f239eada035d288b77269aebc42f644ea6 (diff)
patch 7.4.1936v7.4.1936
Problem: Off-by-one error in bounds check. (Coverity) Solution: Check register number properly.
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1936,
+/**/
1935,
/**/
1934,