aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-11-26 16:00:24 -0700
committerJames McCoy <jamessan@jamessan.com>2016-12-12 10:17:35 -0500
commite97e24c77e70ec8bdaca51b0b477ca0c38ea35e0 (patch)
treeec08245b3fec18fdbb619bba842ece9224836358
parent0645787741252ba7ad980a47af8db5d37685beae (diff)
downloadrneovim-e97e24c77e70ec8bdaca51b0b477ca0c38ea35e0.tar.gz
rneovim-e97e24c77e70ec8bdaca51b0b477ca0c38ea35e0.tar.bz2
rneovim-e97e24c77e70ec8bdaca51b0b477ca0c38ea35e0.zip
vim-patch:7.4.1718
Problem: Coverity: not using return value of set_ref_in_item(). Solution: Use the return value. https://github.com/vim/vim/commit/d56374e25df0b317b01423a01f158157faa647fa
-rw-r--r--src/nvim/eval.c3
-rw-r--r--src/nvim/version.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index b7d5d8bcab..8d5578fb50 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6105,7 +6105,8 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
if (pt != NULL) {
for (i = 0; i < pt->pt_argc; i++) {
- abort = set_ref_in_item(&pt->pt_argv[i], copyID, ht_stack, list_stack);
+ abort = abort || set_ref_in_item(&pt->pt_argv[i], copyID,
+ ht_stack, list_stack);
}
}
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ac45e2caad..00e2bfac91 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -723,8 +723,8 @@ static int included_patches[] = {
// 1722 NA
// 1721 NA
// 1720,
- // 1719,
- // 1718,
+ 1719,
+ 1718,
// 1717 NA
1716,
1715,