patch 8.2.2190: Vim9: crash when compiled with EXITFREE
Problem: Vim9: crash when compiled with EXITFREE.
Solution: Check that df_ufunc is not NULL.
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 015fe3d..3b57e31 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -2011,5 +2011,27 @@
nunmap <F3>
enddef
+" this was crashing on exit
+def Test_nested_lambda_in_closure()
+ var lines =<< trim END
+ vim9script
+ def Outer()
+ def g:Inner()
+ echo map([1, 2, 3], {_, v -> v + 1})
+ enddef
+ g:Inner()
+ enddef
+ defcompile
+ writefile(['Done'], 'XnestedDone')
+ quit
+ END
+ if !RunVim([], lines, '--clean')
+ return
+ endif
+ assert_equal(['Done'], readfile('XnestedDone'))
+ delete('XnestedDone')
+enddef
+
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 65dfcdf..427c8f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2190,
+/**/
2189,
/**/
2188,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 8e07968..7ee15fe 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -8081,9 +8081,10 @@
{
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
+ isn->isn_arg.funcref.fr_func;
+ ufunc_T *ufunc = dfunc->df_ufunc;
- if (func_name_refcount(dfunc->df_ufunc->uf_name))
- func_ptr_unref(dfunc->df_ufunc);
+ if (ufunc != NULL && func_name_refcount(ufunc->uf_name))
+ func_ptr_unref(ufunc);
}
break;