summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-28 22:59:45 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-28 22:59:45 +0100
commit8cbd6dfc0c9d84c5be8414dfdea3b28b72dfddb6 (patch)
tree57e005aa3f2a4769e452d1833fedad525b53efdb
parent97a2af39cd3249c6cbe5a5c59bc24167632d39ad (diff)
downloadvim-git-8cbd6dfc0c9d84c5be8414dfdea3b28b72dfddb6.tar.gz
patch 8.2.0169: Coverity warning for dead codev8.2.0169
Problem: Coverity warning for dead code. Solution: Check if inside try-finally.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 231640caa..55602669f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 169,
+/**/
168,
/**/
167,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 480f1ec56..6e003d938 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -851,6 +851,11 @@ call_def_function(
// return from a :def function call
case ISN_RETURN:
{
+ garray_T *trystack = &ectx.ec_trystack;
+
+ if (trystack->ga_len > 0)
+ trycmd = ((trycmd_T *)trystack->ga_data)
+ + trystack->ga_len - 1;
if (trycmd != NULL && trycmd->tcd_frame == ectx.ec_frame
&& trycmd->tcd_finally_idx != 0)
{