aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.2183: Maximum callback depth is not configurable

Browse Source 
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>
This commit is contained in:
zeertzjq
2023-12-21 16:59:26 +01:00
committed by Christian Brabandt
parent 632b38b45f
commit fe583b1e59
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/message.txt
View File

@@ -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 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 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 larger. When it's more there probably is an endless loop. Probably a
|:execute| or |:source| command is involved. |:execute| or |:source| command is involved.
Can also happen with a recursive callback function (|job-callback|).
A limit of 20 is used here.
*E254* *E254*
Cannot allocate color {name} ~ Cannot allocate color {name} ~

3
runtime/doc/options.txt
View File

@@ -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 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 Increasing this limit above 200 also changes the maximum for Ex
command recursion, see |E169|. command recursion, see |E169|.
See also |:function|. See also |:function|.
Also used for maximum depth of callback functions.
*'maxmapdepth'* *'mmd'* *E223* *'maxmapdepth'* *'mmd'* *E223*
'maxmapdepth' 'mmd' number (default 1000) 'maxmapdepth' 'mmd' number (default 1000)

5
src/testdir/test_popupwin.vim
View File

@@ -4206,10 +4206,13 @@ func Test_popupwin_with_error()
endfunc endfunc
func Test_popup_close_callback_recursive() func Test_popup_close_callback_recursive()
set maxfuncdepth=20
" this invokes the callback recursively " this invokes the callback recursively
let winid = popup_create('something', #{callback: 'popup_close'}) let winid = popup_create('something', #{callback: 'popup_close'})
redraw redraw
call assert_fails('call popup_close(winid)', 'E169') call assert_fails('call popup_close(winid)', 'E169:')
set maxfuncdepth&
endfunc endfunc
" vim: shiftwidth=2 sts=2 " vim: shiftwidth=2 sts=2

5
src/userfunc.c
View File

@@ -14,9 +14,6 @@
#include "vim.h" #include "vim.h"
#if defined(FEAT_EVAL) || defined(PROTO) #if defined(FEAT_EVAL) || defined(PROTO)
#define MAX_CALLBACK_DEPTH 20
/* /*
* All user-defined functions are found in this hashtable. * All user-defined functions are found in this hashtable.
*/ */
@@ -3603,7 +3600,7 @@ call_callback(
if (callback->cb_name == NULL || *callback->cb_name == NUL) if (callback->cb_name == NULL || *callback->cb_name == NUL)
return FAIL; return FAIL;
if (callback_depth > MAX_CALLBACK_DEPTH) if (callback_depth > p_mfd)
{ {
emsg(_(e_command_too_recursive)); emsg(_(e_command_too_recursive));
return FAIL; return FAIL;

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2183,
/**/ /**/
2182, 2182,
/**/ /**/