# HG changeset patch # User Bram Moolenaar # Date 1594568704 -7200 # Node ID 13b1567ae0c6a09856e845acb56f6047a56e5d54 # Parent fcc4b91118cfa42d4cbff0ff58a9f419ea03c4b4 patch 8.2.1191: Vim9: crash when function calls itself Commit: https://github.com/vim/vim/commit/985116ae0b7b3ef17e0c0ea2669068dd6b3b39c7 Author: Bram Moolenaar Date: Sun Jul 12 17:31:09 2020 +0200 patch 8.2.1191: Vim9: crash when function calls itself Problem: Vim9: crash when function calls itself. Solution: Add status UF_COMPILING. (closes https://github.com/vim/vim/issues/6441) diff --git a/src/structs.h b/src/structs.h --- a/src/structs.h +++ b/src/structs.h @@ -1539,6 +1539,7 @@ typedef struct funccall_S funccall_T; typedef enum { UF_NOT_COMPILED, UF_TO_BE_COMPILED, + UF_COMPILING, UF_COMPILED } def_status_T; diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -999,5 +999,17 @@ func Test_silent_echo() call delete('XTest_silent_echo') endfunc +def Fibonacci(n: number): number + if n < 2 + return n + else + return Fibonacci(n - 1) + Fibonacci(n - 2) + endif +enddef + +def Test_recursive_call() + assert_equal(6765, Fibonacci(20)) +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1191, +/**/ 1190, /**/ 1189, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6802,6 +6802,8 @@ compile_def_function(ufunc_T *ufunc, int else if (add_def_function(ufunc) == FAIL) return FAIL; + ufunc->uf_def_status = UF_COMPILING; + CLEAR_FIELD(cctx); cctx.ctx_ufunc = ufunc; cctx.ctx_lnum = -1;