From 47510f3d6598a1218958c03ed11337a43b73f48d Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sun, 15 Oct 2023 09:56:16 +0200 Subject: [PATCH] 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 --- runtime/doc/options.txt | 3 ++- src/testdir/test_popupwin.vim | 6 ++++++ src/userfunc.c | 7 +++++++ src/version.c | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 502e77ba1f..492c7da1ee 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.0. Last change: 2023 Aug 15 +*options.txt* For Vim version 9.0. Last change: 2023 Oct 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5485,6 +5485,7 @@ A jump table for the options with a short description can be found at |Q_op|. Increasing this limit above 200 also changes the maximum for Ex command recursion, see |E169|. See also |:function|. + Also used for maximum depth of callback functions. *'maxmapdepth'* *'mmd'* *E223* 'maxmapdepth' 'mmd' number (default 1000) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 60dc5d9b99..a256ddfb2e 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -4205,5 +4205,11 @@ func Test_popupwin_with_error() 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 db16b68049..a3b8bdc103 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -3583,6 +3583,13 @@ call_callback( 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 ec9a07d074..b90f76fc15 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2030, /**/ 2029, /**/ -- 2.47.2