aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-09-18 17:43:15 +0200
committerJurica Bradaric <jbradaric@gmail.com>2016-09-28 21:36:11 +0200
commit75314101691a86575fb7d7b1b2931a5dfe7e14e2 (patch)
tree0ebcd0a4b5c1b9af17cf6e95376b008bc2632e64
parent42731a9a154c991706b8b5816fbdf5d31726cd97 (diff)
downloadrneovim-75314101691a86575fb7d7b1b2931a5dfe7e14e2.tar.gz
rneovim-75314101691a86575fb7d7b1b2931a5dfe7e14e2.tar.bz2
rneovim-75314101691a86575fb7d7b1b2931a5dfe7e14e2.zip
vim-patch:7.4.1679
Problem: Coverity: copying value of v_lock without initializing it. Solution: Init v_lock in rettv_list_alloc() and rettv_dict_alloc(). https://github.com/vim/vim/commit/7d2a5796d39905a972e8f74af5f7b0a62e3de173
-rw-r--r--src/nvim/eval.c6
-rw-r--r--src/nvim/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 045ca22e16..5c6c66ade1 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -4951,7 +4951,8 @@ static list_T *rettv_list_alloc(typval_T *rettv)
list_T *l = list_alloc();
rettv->vval.v_list = l;
rettv->v_type = VAR_LIST;
- ++l->lv_refcount;
+ rettv->v_lock = VAR_UNLOCKED;
+ l->lv_refcount++;
return l;
}
@@ -6131,7 +6132,8 @@ static void rettv_dict_alloc(typval_T *rettv)
rettv->vval.v_dict = d;
rettv->v_type = VAR_DICT;
- ++d->dv_refcount;
+ rettv->v_lock = VAR_UNLOCKED;
+ d->dv_refcount++;
}
/// Clear all the keys of a Dictionary. "d" remains a valid empty Dictionary.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0f939ad1f4..d6a6587135 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -764,7 +764,7 @@ static int included_patches[] = {
1682,
// 1681,
// 1680 NA
- // 1679,
+ 1679,
// 1678 NA
// 1677 NA
1676,