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

patch 8.2.3180: Vim9: memory leak when concatenating to an imported string

Browse Source 
Problem:    Vim9: memory leak when concatenating to an imported string.
Solution:   Clear the destination.
This commit is contained in:
Bram Moolenaar
2021-07-18 21:24:50 +02:00
parent 24e9316560
commit f6488547e3
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/evalvars.c
View File

@@ -3262,6 +3262,7 @@ set_var_const(
// TODO: check the type // TODO: check the type
// TODO: check for const and locked // TODO: check for const and locked
dest_tv = sv->sv_tv; dest_tv = sv->sv_tv;
clear_tv(dest_tv);
} }
} }
@@ -3277,7 +3278,8 @@ set_var_const(
if (need_convert_to_bool(type, tv)) if (need_convert_to_bool(type, tv))
{ {
// Destination is a bool and the value is not, but it can be converted. // Destination is a bool and the value is not, but it can be
// converted.
CLEAR_FIELD(bool_tv); CLEAR_FIELD(bool_tv);
bool_tv.v_type = VAR_BOOL; bool_tv.v_type = VAR_BOOL;
bool_tv.vval.v_number = tv2bool(tv) ? VVAL_TRUE : VVAL_FALSE; bool_tv.vval.v_number = tv2bool(tv) ? VVAL_TRUE : VVAL_FALSE;
@@ -3310,7 +3312,8 @@ set_var_const(
// check the type and adjust to bool if needed // check the type and adjust to bool if needed
where.wt_index = var_idx; where.wt_index = var_idx;
where.wt_variable = TRUE; where.wt_variable = TRUE;
if (check_script_var_type(&di->di_tv, tv, name, where) == FAIL) if (check_script_var_type(&di->di_tv, tv, name, where)
== FAIL)
goto failed; goto failed;
} }
@@ -3322,8 +3325,8 @@ set_var_const(
// can only redefine once // can only redefine once
di->di_flags &= ~DI_FLAGS_RELOAD; di->di_flags &= ~DI_FLAGS_RELOAD;
// A Vim9 script-local variable is also present in sn_all_vars and // A Vim9 script-local variable is also present in sn_all_vars
// sn_var_vals. It may set "type" from "tv". // and sn_var_vals. It may set "type" from "tv".
if (var_in_vim9script) if (var_in_vim9script)
update_vim9_script_var(FALSE, di, flags, tv, &type, update_vim9_script_var(FALSE, di, flags, tv, &type,
(flags & ASSIGN_NO_MEMBER_TYPE) == 0); (flags & ASSIGN_NO_MEMBER_TYPE) == 0);
@@ -3342,8 +3345,9 @@ set_var_const(
{ {
char_u *val = tv_get_string(tv); char_u *val = tv_get_string(tv);
// Careful: when assigning to v:errmsg and tv_get_string() // Careful: when assigning to v:errmsg and
// causes an error message the variable will already be set. // tv_get_string() causes an error message the variable
// will already be set.
if (di->di_tv.vval.v_string == NULL) if (di->di_tv.vval.v_string == NULL)
di->di_tv.vval.v_string = vim_strsave(val); di->di_tv.vval.v_string = vim_strsave(val);
} }
@@ -3359,7 +3363,8 @@ set_var_const(
{ {
di->di_tv.vval.v_number = tv_get_number(tv); di->di_tv.vval.v_number = tv_get_number(tv);
if (STRCMP(varname, "searchforward") == 0) if (STRCMP(varname, "searchforward") == 0)
set_search_direction(di->di_tv.vval.v_number ? '/' : '?'); set_search_direction(di->di_tv.vval.v_number
? '/' : '?');
#ifdef FEAT_SEARCH_EXTRA #ifdef FEAT_SEARCH_EXTRA
else if (STRCMP(varname, "hlsearch") == 0) else if (STRCMP(varname, "hlsearch") == 0)
{ {

2
src/version.c
View File

@@ -755,6 +755,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 */
/**/
3180,
/**/ /**/
3179, 3179,
/**/ /**/