patch 9.0.2030: no max callback recursion limit
Problem: no max callback recursion limit
Solution: bail out, if max call recursion for callback functions
has been reached.
This checks the 'maxfuncdepth' setting and throws E169 when a callback
function recursively calls itself.
closes: #13337
closes: #13339
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 60dc5d9..a256ddf 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -4205,5 +4205,11 @@
call StopVimInTerminal(buf)
endfunc
+func Test_popup_close_callback_recursive()
+ " this invokes the callback recursively
+ let winid = popup_create('something', #{callback: 'popup_close'})
+ redraw
+ call assert_fails('call popup_close(winid)', 'E169')
+endfunc
" vim: shiftwidth=2 sts=2
diff --git a/src/userfunc.c b/src/userfunc.c
index db16b68..a3b8bdc 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3583,6 +3583,13 @@
if (callback->cb_name == NULL || *callback->cb_name == NUL)
return FAIL;
+
+ if (callback_depth > p_mfd)
+ {
+ emsg(_(e_command_too_recursive));
+ return FAIL;
+ }
+
CLEAR_FIELD(funcexe);
funcexe.fe_evaluate = TRUE;
funcexe.fe_partial = callback->cb_partial;
diff --git a/src/version.c b/src/version.c
index ec9a07d..b90f76f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2030,
+/**/
2029,
/**/
2028,