mirror of
https://github.com/vim/vim
synced 2025-04-02 16:06:45 +02:00
patch 9.1.0341: Problem: a few memory leaks are found
Problem: a few memory leaks are found (LuMingYinDetect ) Solution: properly free the memory Fixes the following problems: - Memory leak in f_maplist() fixes: #14486 - Memory leak in option.c fixes: #14485 - Memory leak in f_resolve() fixes: #14484 - Memory leak in f_autocmd_get() related: #14474 - Memory leak in dict_extend_func() fixes: #14477 fixes: #14238 closes: #14517 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
f7d31adcc2
commit
29269a71b5
7 changed files with 27 additions and 0 deletions
|
@ -3406,7 +3406,10 @@ f_autocmd_get(typval_T *argvars, typval_T *rettv)
|
||||||
event_dict = dict_alloc();
|
event_dict = dict_alloc();
|
||||||
if (event_dict == NULL
|
if (event_dict == NULL
|
||||||
|| list_append_dict(event_list, event_dict) == FAIL)
|
|| list_append_dict(event_list, event_dict) == FAIL)
|
||||||
|
{
|
||||||
|
vim_free(pat);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (dict_add_string(event_dict, "event", event_name) == FAIL
|
if (dict_add_string(event_dict, "event", event_name) == FAIL
|
||||||
|| dict_add_string(event_dict, "group",
|
|| dict_add_string(event_dict, "group",
|
||||||
|
@ -3421,7 +3424,10 @@ f_autocmd_get(typval_T *argvars, typval_T *rettv)
|
||||||
|| dict_add_bool(event_dict, "once", ac->once) == FAIL
|
|| dict_add_bool(event_dict, "once", ac->once) == FAIL
|
||||||
|| dict_add_bool(event_dict, "nested",
|
|| dict_add_bool(event_dict, "nested",
|
||||||
ac->nested) == FAIL)
|
ac->nested) == FAIL)
|
||||||
|
{
|
||||||
|
vim_free(pat);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1300,12 +1300,18 @@ dict_extend_func(
|
||||||
|
|
||||||
action = tv_get_string_chk(&argvars[2]);
|
action = tv_get_string_chk(&argvars[2]);
|
||||||
if (action == NULL)
|
if (action == NULL)
|
||||||
|
{
|
||||||
|
if (is_new)
|
||||||
|
dict_unref(d1);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
for (i = 0; i < 3; ++i)
|
for (i = 0; i < 3; ++i)
|
||||||
if (STRCMP(action, av[i]) == 0)
|
if (STRCMP(action, av[i]) == 0)
|
||||||
break;
|
break;
|
||||||
if (i == 3)
|
if (i == 3)
|
||||||
{
|
{
|
||||||
|
if (is_new)
|
||||||
|
dict_unref(d1);
|
||||||
semsg(_(e_invalid_argument_str), action);
|
semsg(_(e_invalid_argument_str), action);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2110,6 +2110,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
{
|
{
|
||||||
vim_free(p);
|
vim_free(p);
|
||||||
|
vim_free(remain);
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2574,7 +2574,10 @@ f_maplist(typval_T *argvars UNUSED, typval_T *rettv)
|
||||||
if ((d = dict_alloc()) == NULL)
|
if ((d = dict_alloc()) == NULL)
|
||||||
return;
|
return;
|
||||||
if (list_append_dict(rettv->vval.v_list, d) == FAIL)
|
if (list_append_dict(rettv->vval.v_list, d) == FAIL)
|
||||||
|
{
|
||||||
|
dict_unref(d);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
keys_buf = NULL;
|
keys_buf = NULL;
|
||||||
did_simplify = FALSE;
|
did_simplify = FALSE;
|
||||||
|
|
|
@ -853,7 +853,10 @@ set_string_default_esc(char *name, char_u *val, int escape)
|
||||||
|
|
||||||
opt_idx = findoption((char_u *)name);
|
opt_idx = findoption((char_u *)name);
|
||||||
if (opt_idx < 0)
|
if (opt_idx < 0)
|
||||||
|
{
|
||||||
|
vim_free(p);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (options[opt_idx].flags & P_DEF_ALLOCED)
|
if (options[opt_idx].flags & P_DEF_ALLOCED)
|
||||||
vim_free(options[opt_idx].def_val[VI_DEFAULT]);
|
vim_free(options[opt_idx].def_val[VI_DEFAULT]);
|
||||||
|
|
|
@ -1530,4 +1530,10 @@ func Test_indexof()
|
||||||
delfunc TestIdx
|
delfunc TestIdx
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_extendnew_leak()
|
||||||
|
" This used to leak memory
|
||||||
|
for i in range(100) | silent! call extendnew([], [], []) | endfor
|
||||||
|
for i in range(100) | silent! call extendnew({}, {}, {}) | endfor
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
|
|
@ -704,6 +704,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 */
|
||||||
|
/**/
|
||||||
|
341,
|
||||||
/**/
|
/**/
|
||||||
340,
|
340,
|
||||||
/**/
|
/**/
|
||||||
|
|
Loading…
Add table
Reference in a new issue