patch 8.2.2504: Vim9: crash when using an argument from a closure

Problem:    Vim9: crash when using an argument from a closure.
Solution:   Check if gen_load_outer is NULL. (closes #7821)

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index cdaba5af74094c603d873ac9bcc1a09c8c25948b..cea25a4314e7b3c68d41f9b9b0a11a3ecfcea1fc 100644 (file)
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1669,6 +1669,18 @@ def Test_closure_using_argument()
 
   unlet g:UseArg
   unlet g:UseVararg
+
+  var lines =<< trim END
+      vim9script
+      def Test(Fun: func(number): number): list<number>
+        return map([1, 2, 3], (_, i) => Fun(i))
+      enddef
+      def Inc(nr: number): number
+        return nr + 2
+      enddef
+      assert_equal([3, 4, 5], Test(Inc))
+  END
+  CheckScriptSuccess(lines)
 enddef
 
 def MakeGetAndAppendRefs()

diff --git a/src/version.c b/src/version.c
index 60f8a711d8e1fd297bd2b910ed2c21842b5f921f..465b5b04a230689f015dc9977e0da1ee413668a2 100644 (file)
--- 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 */
+/**/
+    2504,
 /**/
     2503,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 4dfb42f352c4c05c1e9b699472302e8edb6e3b6d..b4b9c28c1d8f0f0930ebb9c631cae15e1b699df8 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -261,7 +261,8 @@ arg_exists(
        if (arg_exists(name, len, idxp, type, gen_load_outer, cctx->ctx_outer)
                                                                         == OK)
        {
-           ++*gen_load_outer;
+           if (gen_load_outer != NULL)
+               ++*gen_load_outer;
            return OK;
        }
     }