# HG changeset patch # User Christian Brabandt # Date 1699805703 -3600 # Node ID f2445075dbebb484609dd16f54224aacd791f08d # Parent c8089a29bcc4ecd2580a33147d37128536a0b29f patch 9.0.2103: recursive callback may cause issues on some archs Commit: https://github.com/vim/vim/commit/2076463e383901cef44685aaf4b63e4306444f9e Author: Christian Brabandt Date: Sun Nov 12 16:59:29 2023 +0100 patch 9.0.2103: recursive callback may cause issues on some archs Problem: recursive callback may cause issues on some archs Solution: Decrease the limit drastically to 20 Recursive callback limit causes problems on some architectures Since commit 47510f3d6598a1218958c03ed11337a43b73f48d we have a test that causes a recursive popup callback function to be executed. However it seems the current limit of 'maxfuncdepth' option value is still too recursive for some 32bit architectures (e.g. 32bit ARM). So instead of allowing a default limit of 100 (default value for 'maxfuncdepth'), let's reduce this limit to 20. I don't think there is a use case where one would need such a high recursive callback limit and a limit of 20 seems reasonable (although it is currently hard-coded). closes: #13495 closes: #13502 Signed-off-by: Christian Brabandt diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 9.0. Last change: 2023 May 24 +*message.txt* For Vim version 9.0. Last change: 2023 Nov 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -135,6 +135,8 @@ This happens when an Ex command executes 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 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5486,7 +5486,6 @@ A jump table for the options with a shor 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/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -14,6 +14,9 @@ #include "vim.h" #if defined(FEAT_EVAL) || defined(PROTO) + +#define MAX_CALLBACK_DEPTH 20 + /* * All user-defined functions are found in this hashtable. */ @@ -3584,7 +3587,7 @@ call_callback( if (callback->cb_name == NULL || *callback->cb_name == NUL) return FAIL; - if (callback_depth > p_mfd) + if (callback_depth > MAX_CALLBACK_DEPTH) { emsg(_(e_command_too_recursive)); return FAIL; diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 2103, +/**/ 2102, /**/ 2101,