diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-16 17:19:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-16 17:19:22 +0200 |
| commit | 495b7dd213e096361e6f15e7aed313c1d63d9d3e (patch) | |
| tree | 175e666c7745acbf7c347d59fb44c82771cf957e | |
| parent | 4cf56bbc85f77846aeb378cfb071677336dfad6d (diff) | |
patch 8.0.1115: crash when using foldtextresult() recursivelyv8.0.1115
Problem: Crash when using foldtextresult() recursively.
Solution: Avoid recursive calls. (Yasuhiro Matsumoto, closes #2098)
| -rw-r--r-- | src/evalfunc.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_fold.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 63aa34c5d3..d438a89126 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3642,11 +3642,16 @@ f_foldtextresult(typval_T *argvars UNUSED, typval_T *rettv) char_u buf[FOLD_TEXT_LEN]; foldinfo_T foldinfo; int fold_count; + static int entered = FALSE; #endif rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; #ifdef FEAT_FOLDING + if (entered) + return; /* reject recursive use */ + entered = TRUE; + lnum = get_tv_lnum(argvars); /* treat illegal types and illegal string values for {lnum} the same */ if (lnum < 0) @@ -3660,6 +3665,8 @@ f_foldtextresult(typval_T *argvars UNUSED, typval_T *rettv) text = vim_strsave(text); rettv->vval.v_string = text; } + + entered = FALSE; #endif } diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim index 213c0fa458..b6ba99c56f 100644 --- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -278,6 +278,7 @@ func Test_move_folds_around_manual() call assert_equal(0, foldlevel(6)) call assert_equal(9, foldclosedend(7)) call assert_equal([-1, 2, 2, 2, 2, -1, 7, 7, 7, -1], map(range(1, line('$')), 'foldclosed(v:val)')) + %d " Ensure moving around the edges still works. call setline(1, PrepIndent("a") + repeat(["a"], 3) + ["\ta"]) @@ -446,3 +447,16 @@ func Test_fold_error() set foldmethod& bw! endfunc + +func Test_foldtext_recursive() + new + call setline(1, ['{{{', 'some text', '}}}']) + setlocal foldenable foldmethod=marker foldtext=foldtextresult(v\:foldstart) + " This was crashing because of endless recursion. + 2foldclose + redraw + call assert_equal(1, foldlevel(2)) + call assert_equal(1, foldclosed(2)) + call assert_equal(3, foldclosedend(2)) + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index 90aa45c0f4..8b777e7e17 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1115, +/**/ 1114, /**/ 1113, |