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

patch 8.2.0882: leaking memory when using reduce()

Browse Source 
Problem:    Leaking memory when using reduce().
Solution:   Free the intermediate value.
This commit is contained in:
Bram Moolenaar
2020-06-01 20:11:02 +02:00
parent d6a77f95ee
commit 48b1c21809
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/list.c
View File

@@ -2311,7 +2311,7 @@ f_reverse(typval_T *argvars, typval_T *rettv)
void void
f_reduce(typval_T *argvars, typval_T *rettv) f_reduce(typval_T *argvars, typval_T *rettv)
{ {
typval_T accum; typval_T initial;
char_u *func_name; char_u *func_name;
partial_T *partial = NULL; partial_T *partial = NULL;
funcexe_T funcexe; funcexe_T funcexe;
@@ -2343,6 +2343,7 @@ f_reduce(typval_T *argvars, typval_T *rettv)
{ {
list_T *l = argvars[0].vval.v_list; list_T *l = argvars[0].vval.v_list;
listitem_T *li = NULL; listitem_T *li = NULL;
int r;
CHECK_LIST_MATERIALIZE(l); CHECK_LIST_MATERIALIZE(l);
if (argvars[2].v_type == VAR_UNKNOWN) if (argvars[2].v_type == VAR_UNKNOWN)
@@ -2352,24 +2353,26 @@ f_reduce(typval_T *argvars, typval_T *rettv)
semsg(_(e_reduceempty), "List"); semsg(_(e_reduceempty), "List");
return; return;
} }
accum = l->lv_first->li_tv; initial = l->lv_first->li_tv;
li = l->lv_first->li_next; li = l->lv_first->li_next;
} }
else else
{ {
accum = argvars[2]; initial = argvars[2];
if (l != NULL) if (l != NULL)
li = l->lv_first; li = l->lv_first;
} }
copy_tv(&accum, rettv); copy_tv(&initial, rettv);
for ( ; li != NULL; li = li->li_next) for ( ; li != NULL; li = li->li_next)
{ {
argv[0] = accum; argv[0] = *rettv;
argv[1] = li->li_tv; argv[1] = li->li_tv;
if (call_func(func_name, -1, rettv, 2, argv, &funcexe) == FAIL) rettv->v_type = VAR_UNKNOWN;
r = call_func(func_name, -1, rettv, 2, argv, &funcexe);
clear_tv(&argv[0]);
if (r == FAIL)
return; return;
accum = *rettv;
} }
} }
else else
@@ -2384,27 +2387,31 @@ f_reduce(typval_T *argvars, typval_T *rettv)
semsg(_(e_reduceempty), "Blob"); semsg(_(e_reduceempty), "Blob");
return; return;
} }
accum.v_type = VAR_NUMBER; initial.v_type = VAR_NUMBER;
accum.vval.v_number = blob_get(b, 0); initial.vval.v_number = blob_get(b, 0);
i = 1; i = 1;
} }
else if (argvars[2].v_type != VAR_NUMBER)
{
emsg(_(e_number_exp));
return;
}
else else
{ {
accum = argvars[2]; initial = argvars[2];
i = 0; i = 0;
} }
copy_tv(&accum, rettv); copy_tv(&initial, rettv);
if (b != NULL) if (b != NULL)
{ {
for ( ; i < b->bv_ga.ga_len; i++) for ( ; i < b->bv_ga.ga_len; i++)
{ {
argv[0] = accum; argv[0] = *rettv;
argv[1].v_type = VAR_NUMBER; argv[1].v_type = VAR_NUMBER;
argv[1].vval.v_number = blob_get(b, i); argv[1].vval.v_number = blob_get(b, i);
if (call_func(func_name, -1, rettv, 2, argv, &funcexe) == FAIL) if (call_func(func_name, -1, rettv, 2, argv, &funcexe) == FAIL)
return; return;
accum = *rettv;
} }
} }
} }

2
src/version.c
View File

@@ -746,6 +746,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 */
/**/
882,
/**/ /**/
881, 881,
/**/ /**/