thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3711: Vim9: memory leak when compiling :elseif fails

Browse Source 
Problem:    Vim9: memory leak when compiling :elseif fails.
Solution:   Cleanup ppconst.
This commit is contained in:
Bram Moolenaar
2021-12-01 10:10:22 +00:00
parent 3d2e031d4f
commit 56a8ffdb6e
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/testdir/test_vim9_cmd.vim
View File

@@ -301,12 +301,21 @@ def Test_condition_types()
CheckDefAndScriptFailure(lines, 'E1135:', 3)
lines =<< trim END
g:cond = 0
if g:cond
elseif 'text' garbage
endif
END
CheckDefAndScriptFailure(lines, 'E488:', 3)
lines =<< trim END
g:cond = 0
if g:cond
elseif [1]
endif
END
CheckDefFailure(lines, 'E1012:', 2)
CheckScriptFailure(['vim9script'] + lines, 'E745:', 3)
CheckDefFailure(lines, 'E1012:', 3)
CheckScriptFailure(['vim9script'] + lines, 'E745:', 4)
lines =<< trim END
g:cond = 'text'

2
src/version.c
View File

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

4
src/vim9compile.c
View File

@@ -7888,6 +7888,7 @@ compile_elseif(char_u *arg, cctx_T *cctx)
cctx->ctx_skip = save_skip;
if (!ends_excmd2(arg, skipwhite(p)))
{
clear_ppconst(&ppconst);
semsg(_(e_trailing_arg), p);
return NULL;
}
@@ -7901,7 +7902,10 @@ compile_elseif(char_u *arg, cctx_T *cctx)
// The expression result is a constant.
v = tv_get_bool_chk(&ppconst.pp_tv[0], &error);
if (error)
{
clear_ppconst(&ppconst);
return NULL;
}
cctx->ctx_skip = v ? SKIP_NOT : SKIP_YES;
clear_ppconst(&ppconst);
scope->se_u.se_if.is_if_label = -1;