aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-09-18 17:44:45 +0200
committerJurica Bradaric <jbradaric@gmail.com>2016-09-28 21:45:07 +0200
commitb0aa748e1463f78eadebc119a09ada0e25c13e6b (patch)
tree2b8e6ed5357fd40600fc7dc26e85aa2edf7648d3
parent75314101691a86575fb7d7b1b2931a5dfe7e14e2 (diff)
downloadrneovim-b0aa748e1463f78eadebc119a09ada0e25c13e6b.tar.gz
rneovim-b0aa748e1463f78eadebc119a09ada0e25c13e6b.tar.bz2
rneovim-b0aa748e1463f78eadebc119a09ada0e25c13e6b.zip
vim-patch:7.4.1681
Problem: Coverity warns for fixed size buffer length (false positive). Solution: Add a check for the name length. https://github.com/vim/vim/commit/ef9d9b94a8803c405884bb6914ed745ede57c596
-rw-r--r--src/nvim/eval.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 5c6c66ade1..b05b4c4f7e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -513,6 +513,7 @@ void eval_init(void)
for (size_t i = 0; i < ARRAY_SIZE(vimvars); i++) {
p = &vimvars[i];
+ assert(STRLEN(p->vv_name) <= 16);
STRCPY(p->vv_di.di_key, p->vv_name);
if (p->vv_flags & VV_RO)
p->vv_di.di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d6a6587135..302e78cb6c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -762,7 +762,7 @@ static int included_patches[] = {
// 1684 NA
// 1683 NA
1682,
- // 1681,
+ 1681,
// 1680 NA
1679,
// 1678 NA