From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 8 Jun 2021 20:01:53 +0000 (+0200)
Subject: patch 8.2.2965: Vim9: crash when calling function that failed to compile
X-Git-Tag: v8.2.2965
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b55d618f193d9f413612d8d4e62758056e842e46;p=vim

patch 8.2.2965: Vim9: crash when calling function that failed to compile

Problem:    Vim9: crash when calling function that failed to compile.
Solution:   Fail when trying to call the function. (closes #8344)
---

diff --git a/src/errors.h b/src/errors.h
index 94a752ae6..fac3e26d8 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -423,3 +423,5 @@ EXTERN char e_one_argument_too_few[]
 	INIT(= N_("E1190: One argument too few"));
 EXTERN char e_nr_arguments_too_few[]
 	INIT(= N_("E1190: %d arguments too few"));
+EXTERN char e_call_to_function_that_failed_to_compile_str[]
+	INIT(= N_("E1191: Call to function that failed to compile: %s"));
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 7e21b3788..cd2a15d2d 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -74,6 +74,22 @@ def TestCompilingErrorInTry()
   delete('Xdir', 'rf')
 enddef
 
+def Test_compile_error_in_called_function()
+  var lines =<< trim END
+      vim9script
+      var n: number
+      def Foo()
+        &hls = n
+      enddef
+      def Bar()
+        Foo()
+      enddef
+      silent! Foo()
+      Bar()
+  END
+  CheckScriptFailureList(lines, ['E1012:', 'E1191:'])
+enddef
+
 def Test_autoload_name_mismatch()
   var dir = 'Xdir/autoload'
   mkdir(dir, 'p')
diff --git a/src/version.c b/src/version.c
index de03654af..aee9dcff2 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 */
+/**/
+    2965,
 /**/
     2964,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 28108bfe7..6fcad3db4 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1950,6 +1950,12 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount)
 					       PROFILING(ufunc), NULL) == FAIL)
 	    return FAIL;
     }
+    if (ufunc->uf_def_status == UF_COMPILE_ERROR)
+    {
+	emsg_funcname(_(e_call_to_function_that_failed_to_compile_str),
+							       ufunc->uf_name);
+	return FAIL;
+    }
 
     if ((isn = generate_instr(cctx,
 		    ufunc->uf_def_status != UF_NOT_COMPILED ? ISN_DCALL