changeset 23481:62fe9a7fd582 v8.2.2283

patch 8.2.2283: Vim9: crash when lambda has fewer arguments than expected Commit: https://github.com/vim/vim/commit/e68b02a1c40388bbb85e7b825bc538298963e1e1 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 3 13:09:51 2021 +0100 patch 8.2.2283: Vim9: crash when lambda has fewer arguments than expected Problem: Vim9: crash when lambda has fewer arguments than expected. Solution: Don't check arguments when already failed. (closes https://github.com/vim/vim/issues/7606)
author Bram Moolenaar <Bram@vim.org>
date Sun, 03 Jan 2021 13:15:04 +0100
parents 4d63776659b9
children bcb2ec1434b6
files src/testdir/test_vim9_func.vim src/version.c src/vim9type.c
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -554,6 +554,18 @@ def Test_call_lambda_args()
       echo Ref(1, 'x')
   END
   CheckDefFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got string')
+
+  lines =<< trim END
+    var Ref: func(job, string, number)
+    Ref = (x, y) => 0
+  END
+  CheckDefAndScriptFailure(lines, 'E1012:')
+
+  lines =<< trim END
+    var Ref: func(job, string)
+    Ref = (x, y, z) => 0
+  END
+  CheckDefAndScriptFailure(lines, 'E1012:')
 enddef
 
 def Test_lambda_uses_assigned_var()
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2283,
+/**/
     2282,
 /**/
     2281,
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -490,8 +490,9 @@ check_type(type_T *expected, type_T *act
 		    && actual->tt_argcount != -1
 		    && (actual->tt_argcount < expected->tt_min_argcount
 			|| actual->tt_argcount > expected->tt_argcount))
-		    ret = FAIL;
-	    if (expected->tt_args != NULL && actual->tt_args != NULL)
+		ret = FAIL;
+	    if (ret == OK && expected->tt_args != NULL
+						    && actual->tt_args != NULL)
 	    {
 		int i;