diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-18 13:42:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-18 13:42:29 +0200 |
| commit | c6ba2f9dde6d01c8ab356c239c2259f7d83652a4 (patch) | |
| tree | c1e27d14ae92ba1ffd4f034031f2f18b773d01d5 | |
| parent | 47bc9c333766ee3d45cb18c583a630e4ad53405a (diff) | |
patch 8.2.3175: Vim9: using illegal pointer with nested lambdas.v8.2.3175
Problem: Vim9: using illegal pointer with inline function inside a lambda.
Solution: Clear eval_tofree_cmdline when advancing to the next line.
(closes #8578)
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 5dc1642a16..2e8ab3d8fc 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2177,6 +2177,11 @@ eval_next_line(evalarg_T *evalarg) vim_free(evalarg->eval_tofree); evalarg->eval_tofree = line; } + + // Advanced to the next line, "arg" no longer points into the previous + // line. + VIM_CLEAR(evalarg->eval_tofree_cmdline); + return skipwhite(line); } diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index c89c13e2dc..a2c4e7daed 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -2265,6 +2265,22 @@ def Test_nested_inline_lambda() }) END CheckScriptSuccess(lines) + + lines =<< trim END + vim9script + + def s:func() + range(10) + ->mapnew((_, _) => ({ + key: range(10)->mapnew((_, _) => { + return ' ' + }), + })) + enddef + + defcomp + END + CheckScriptSuccess(lines) enddef def Shadowed(): list<number> diff --git a/src/version.c b/src/version.c index e1421ddb4e..8b674d3773 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3175, +/**/ 3174, /**/ 3173, |