Mercurial > vim
changeset 10488:89200fa1d174 v8.0.0137
commit https://github.com/vim/vim/commit/777b30f827bcbe10a40640b1bf0361cb93a16be1
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 2 15:26:27 2017 +0100
patch 8.0.0137
Problem: When 'maxfuncdepth' is set above 200 the nesting is limited to
200. (Brett Stahlman)
Solution: Allow for Ex command recursion depending on 'maxfuncdepth'.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 02 Jan 2017 15:30:04 +0100 |
| parents | 36f5306701e5 |
| children | 5f1ca9427de6 |
| files | src/ex_docmd.c src/testdir/test_nested_function.vim src/version.c |
| diffstat | 3 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -787,8 +787,9 @@ do_cmdline( #endif /* It's possible to create an endless loop with ":execute", catch that - * here. The value of 200 allows nested function calls, ":source", etc. */ - if (call_depth == 200) + * here. The value of 200 allows nested function calls, ":source", etc. + * Allow 200 or 'maxfuncdepth', whatever is larger. */ + if (call_depth >= 200 && call_depth >= p_mfd) { EMSG(_("E169: Command too recursive")); #ifdef FEAT_EVAL
--- a/src/testdir/test_nested_function.vim +++ b/src/testdir/test_nested_function.vim @@ -40,3 +40,24 @@ func Test_nested_argument() delfunc g:X unlet g:Y endfunc + +func Recurse(count) + if a:count > 0 + call Recurse(a:count - 1) + endif +endfunc + +func Test_max_nesting() + let call_depth_here = 2 + let ex_depth_here = 5 + set mfd& + + call Recurse(99 - call_depth_here) + call assert_fails('call Recurse(' . (100 - call_depth_here) . ')', 'E132:') + + set mfd=210 + call Recurse(209 - ex_depth_here) + call assert_fails('call Recurse(' . (210 - ex_depth_here) . ')', 'E169:') + + set mfd& +endfunc