aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0554: using freed memory when command follows lambda

Browse Source 
Problem:    Using freed memory when command follows lambda.
Solution:   Don't free what is still in use. (closes #11201)
This commit is contained in:
Bram Moolenaar
2022-09-23 12:44:25 +01:00
parent f5f4e85f01
commit f8addf1ca1
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/eval.c
View File

@@ -382,23 +382,34 @@ clear_evalarg(evalarg_T *evalarg, exarg_T *eap)
{
if (evalarg != NULL)
{
if (evalarg->eval_tofree != NULL)
garray_T *etga = &evalarg->eval_tofree_ga;
if (evalarg->eval_tofree != NULL || evalarg->eval_using_cmdline)
{
if (eap != NULL)
{
// We may need to keep the original command line, e.g. for
// ":let" it has the variable names. But we may also need the
// new one, "nextcmd" points into it. Keep both.
// ":let" it has the variable names. But we may also need
// the new one, "nextcmd" points into it. Keep both.
vim_free(eap->cmdline_tofree);
eap->cmdline_tofree = *eap->cmdlinep;
*eap->cmdlinep = evalarg->eval_tofree;
if (evalarg->eval_using_cmdline && etga->ga_len > 0)
{
// "nextcmd" points into the last line in eval_tofree_ga,
// need to keep it around.
--etga->ga_len;
*eap->cmdlinep = ((char_u **)etga->ga_data)[etga->ga_len];
}
else
*eap->cmdlinep = evalarg->eval_tofree;
}
else
vim_free(evalarg->eval_tofree);
evalarg->eval_tofree = NULL;
}
ga_clear_strings(&evalarg->eval_tofree_ga);
ga_clear_strings(etga);
VIM_CLEAR(evalarg->eval_tofree_lambda);
}
}

14
src/testdir/test_vim9_func.vim
View File

@@ -1515,6 +1515,20 @@ def Test_lambda_invalid_block()
v9.CheckDefAndScriptFailure(lines, 'E488: Trailing characters: | echo')
enddef
def Test_lambda_with_following_cmd()
var lines =<< trim END
set ts=2
var Lambda = () => {
set ts=4
} | set ts=3
assert_equal(3, &ts)
Lambda()
assert_equal(4, &ts)
END
v9.CheckDefAndScriptSuccess(lines)
set ts=8
enddef
def Test_pass_legacy_lambda_to_def_func()
var lines =<< trim END
vim9script

2
src/version.c
View File

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

7
src/vim9expr.c
View File

@@ -522,10 +522,12 @@ compile_load(
{
type = lvar.lv_type;
idx = lvar.lv_idx;
outer_loop_depth = lvar.lv_loop_depth;
outer_loop_idx = lvar.lv_loop_idx;
if (lvar.lv_from_outer != 0)
{
gen_load_outer = lvar.lv_from_outer;
outer_loop_depth = lvar.lv_loop_depth;
outer_loop_idx = lvar.lv_loop_idx;
}
else
gen_load = TRUE;
}
@@ -1096,6 +1098,7 @@ compile_lambda(char_u **arg, cctx_T *cctx)
*arg = ((char_u **)cctx->ctx_ufunc->uf_lines.ga_data)[cctx->ctx_lnum]
+ off;
evalarg.eval_using_cmdline = FALSE;
}
clear_evalarg(&evalarg, NULL);