From 8cbd6dfc0c9d84c5be8414dfdea3b28b72dfddb6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 28 Jan 2020 22:59:45 +0100 Subject: [PATCH] patch 8.2.0169: Coverity warning for dead code Problem: Coverity warning for dead code. Solution: Check if inside try-finally. --- src/version.c | 2 ++ src/vim9execute.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/version.c b/src/version.c index 231640caa7..55602669f2 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 169, /**/ 168, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index 480f1ec565..6e003d9389 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) { -- 2.47.3