diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-17 18:49:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-17 18:49:11 +0100 |
| commit | c7dac8534ee7f7a49e9d7a37330397c64455cdd7 (patch) | |
| tree | 338f1b5d30833d15a009313588b0289a16e80c2b | |
| parent | 064095012c0b8e4e43e75834b337115950898fbf (diff) | |
patch 8.2.2528: Vim9: crash when compiling lambda failsv8.2.2528
Problem: Vim9: crash when compiling lambda fails.
Solution: Bail out after compilation fails. (closes #7862)
| -rw-r--r-- | src/eval.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_vim9_assign.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 785d8417a4..444c0faf38 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3428,8 +3428,12 @@ eval7( ufunc_T *ufunc = rettv->vval.v_partial->pt_func; // compile it here to get the return type - compile_def_function(ufunc, - TRUE, PROFILING(ufunc), NULL); + if (compile_def_function(ufunc, + TRUE, PROFILING(ufunc), NULL) == FAIL) + { + clear_tv(rettv); + ret = FAIL; + } } } if (ret == NOTDONE) diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 4c63217f26..392a091a1a 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1118,6 +1118,11 @@ def Test_assign_lambda() Ref = (j) => !j END CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected func(number) but got func(any): bool') + + lines =<< trim END + echo filter([1, 2, 3], (_, v: string) => v + 1) + END + CheckDefAndScriptFailure(lines, 'E1051:') enddef def Test_heredoc() diff --git a/src/version.c b/src/version.c index 0fb889621d..4c0fb5c1e5 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2528, +/**/ 2527, /**/ 2526, |