patch 8.2.5117: crash when calling a Lua callback from a :def function
Problem: Crash when calling a Lua callback from a :def function. (Bohdan
Makohin)
Solution: Handle FC_CFUNC in call_user_func_check(). (closes #10587)
diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index e45da6a..7fcd13d 100644
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -664,6 +664,17 @@
\ '[string "vim chunk"]:1: string expected, got table')
endfunc
+def Vim9Test(Callback: func())
+ Callback()
+enddef
+
+func Test_call_lua_func_from_vim9_func()
+ " this only tests that Vim doesn't crash
+ lua << EOF
+vim.fn.Vim9Test(function () print('Hello') end)
+EOF
+endfunc
+
func Test_lua_funcref()
function I(x)
return a:x
diff --git a/src/userfunc.c b/src/userfunc.c
index cc477fe..9b960b7 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3021,6 +3021,15 @@
{
int error;
+#ifdef FEAT_LUA
+ if (fp->uf_flags & FC_CFUNC)
+ {
+ cfunc_T cb = fp->uf_cb;
+
+ return (*cb)(argcount, argvars, rettv, fp->uf_cb_state);
+ }
+#endif
+
if (fp->uf_flags & FC_RANGE && funcexe->fe_doesrange != NULL)
*funcexe->fe_doesrange = TRUE;
error = check_user_func_argcount(fp, argcount);
@@ -3584,14 +3593,6 @@
if (fp != NULL && (fp->uf_flags & FC_DELETED))
error = FCERR_DELETED;
-#ifdef FEAT_LUA
- else if (fp != NULL && (fp->uf_flags & FC_CFUNC))
- {
- cfunc_T cb = fp->uf_cb;
-
- error = (*cb)(argcount, argvars, rettv, fp->uf_cb_state);
- }
-#endif
else if (fp != NULL)
{
if (funcexe->fe_argv_func != NULL)
diff --git a/src/version.c b/src/version.c
index c842e19..1b6fd28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5117,
+/**/
5116,
/**/
5115,