diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-12-21 16:59:26 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-12-21 17:03:31 +0100 |
| commit | fe583b1e5987fbfdb5f2141c133dbff9665ed301 (patch) | |
| tree | 7dad9140e37547e0e6fa8c587507ec2c736188bd | |
| parent | 632b38b45fcd5143d7694e8b628400ec5e4520bd (diff) | |
patch 9.0.2183: Maximum callback depth is not configurablev9.0.2183
Problem: Maximum callback depth is not configurable.
Solution: Revert patch 9.0.2103. Set 'maxfuncdepth' in test.
(zeertzjq)
fixes: #13732
closes: #13736
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/doc/message.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 3 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 5 | ||||
| -rw-r--r-- | src/userfunc.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index f8a9fdfa60..92a8e3cda4 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 9.0. Last change: 2023 Nov 08 +*message.txt* For Vim version 9.0. Last change: 2023 Dec 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -135,8 +135,6 @@ This happens when an Ex command executes an Ex command that executes an Ex command, etc. The limit is 200 or the value of 'maxfuncdepth', whatever is larger. When it's more there probably is an endless loop. Probably a |:execute| or |:source| command is involved. -Can also happen with a recursive callback function (|job-callback|). -A limit of 20 is used here. *E254* Cannot allocate color {name} ~ diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 54ee56f0b5..34059e0ea6 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 Dec 16 +*options.txt* For Vim version 9.0. Last change: 2023 Dec 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5477,6 +5477,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 d01eccc412..c20ff48c62 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -4206,10 +4206,13 @@ func Test_popupwin_with_error() endfunc func Test_popup_close_callback_recursive() + set maxfuncdepth=20 " this invokes the callback recursively let winid = popup_create('something', #{callback: 'popup_close'}) redraw - call assert_fails('call popup_close(winid)', 'E169') + call assert_fails('call popup_close(winid)', 'E169:') + + set maxfuncdepth& endfunc " vim: shiftwidth=2 sts=2 diff --git a/src/userfunc.c b/src/userfunc.c index ea03e78695..c0a2487b46 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -14,9 +14,6 @@ #include "vim.h" #if defined(FEAT_EVAL) || defined(PROTO) - -#define MAX_CALLBACK_DEPTH 20 - /* * All user-defined functions are found in this hashtable. */ @@ -3603,7 +3600,7 @@ call_callback( if (callback->cb_name == NULL || *callback->cb_name == NUL) return FAIL; - if (callback_depth > MAX_CALLBACK_DEPTH) + if (callback_depth > p_mfd) { emsg(_(e_command_too_recursive)); return FAIL; diff --git a/src/version.c b/src/version.c index 6120c538a7..ec2d0e23bf 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2183, +/**/ 2182, /**/ 2181, |