From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Dec 2020 17:13:27 +0000 (+0100)
Subject: patch 8.2.2095: Vim9: crash when failed dict member is followed by concat
X-Git-Tag: v8.2.2095
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4029cabbe7c68a304ab8becb495bd6d91c6e97b1;p=vim

patch 8.2.2095: Vim9: crash when failed dict member is followed by concat

Problem:    Vim9: crash when failed dict member is followed by concatenation.
Solution:   Remove the dict from the stack. (closes #7416)
---

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 18aefe08d..18864cfd1 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1794,6 +1794,25 @@ def Test_abort_even_with_silent()
       enddef
       sil! Func()
       assert_equal('none', g:result)
+      unlet g:result
+  END
+  CheckScriptSuccess(lines)
+enddef
+
+def Test_dict_member_with_silent()
+  var lines =<< trim END
+      vim9script
+      g:result = 'none'
+      var d: dict<any>
+      def Func()
+        try
+          g:result = map([], {_, v -> {}[v]})->join() .. d['']
+        catch
+        endtry
+      enddef
+      silent! Func()
+      assert_equal('0', g:result)
+      unlet g:result
   END
   CheckScriptSuccess(lines)
 enddef
diff --git a/src/version.c b/src/version.c
index a0bf9363c..cfc1639d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2095,
 /**/
     2094,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index a9fd94e9c..dd36cfa6b 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2669,6 +2669,15 @@ call_def_function(
 		    {
 			SOURCING_LNUM = iptr->isn_lnum;
 			semsg(_(e_dictkey), key);
+
+			// If :silent! is used we will continue, make sure the
+			// stack contents makes sense.
+			clear_tv(tv);
+			--ectx.ec_stack.ga_len;
+			tv = STACK_TV_BOT(-1);
+			clear_tv(tv);
+			tv->v_type = VAR_NUMBER;
+			tv->vval.v_number = 0;
 			goto on_fatal_error;
 		    }
 		    clear_tv(tv);