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 47510f3d65 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 <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2023-11-12 16:59:29 +01:00
parent 9588666360
commit 2076463e38
4 changed files with 9 additions and 3 deletions

View File

@ -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 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} ~

View File

@ -5486,7 +5486,6 @@ 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)

View File

@ -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;

View File

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