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

patch 8.2.2101: Vim9: memory leak when literal dict has an error

Browse Source 
Problem:    Vim9: memory leak when literal dict has an error and when an
            expression is not complete.
Solution:   Clear the typval and the growarray.
This commit is contained in:
Bram Moolenaar
2020-12-06 16:03:55 +01:00
parent 67322bf74a
commit 8bb0f5472c
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dict.c
View File

@@ -929,6 +929,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
if (**arg != ']') if (**arg != ']')
{ {
emsg(_(e_missing_matching_bracket_after_dict_key)); emsg(_(e_missing_matching_bracket_after_dict_key));
clear_tv(&tvkey);
return FAIL; return FAIL;
} }
++*arg; ++*arg;

2
src/version.c
View File

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

3
src/vim9compile.c
View File

@@ -4392,7 +4392,10 @@ compile_and_or(
// eval the next expression // eval the next expression
*arg = skipwhite(p + 2); *arg = skipwhite(p + 2);
if (may_get_next_line_error(p + 2, arg, cctx) == FAIL) if (may_get_next_line_error(p + 2, arg, cctx) == FAIL)
{
ga_clear(&end_ga);
return FAIL; return FAIL;
}
if ((opchar == '|' ? compile_expr3(arg, cctx, ppconst) if ((opchar == '|' ? compile_expr3(arg, cctx, ppconst)
: compile_expr4(arg, cctx, ppconst)) == FAIL) : compile_expr4(arg, cctx, ppconst)) == FAIL)