Skip to content

Commit

Permalink
patch 9.1.0341: Problem: a few memory leaks are found
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
chrisbra committed Apr 16, 2024
1 parent f7d31ad commit 29269a7
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/autocmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -3406,7 +3406,10 @@ f_autocmd_get(typval_T *argvars, typval_T *rettv)
event_dict = dict_alloc();
if (event_dict == NULL
|| list_append_dict(event_list, event_dict) == FAIL)
{
vim_free(pat);
return;
}

if (dict_add_string(event_dict, "event", event_name) == FAIL
|| dict_add_string(event_dict, "group",
Expand All @@ -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, "nested",
ac->nested) == FAIL)
{
vim_free(pat);
return;
}
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/dict.c
Original file line number Diff line number Diff line change
Expand Up @@ -1300,12 +1300,18 @@ dict_extend_func(

action = tv_get_string_chk(&argvars[2]);
if (action == NULL)
{
if (is_new)
dict_unref(d1);
return;
}
for (i = 0; i < 3; ++i)
if (STRCMP(action, av[i]) == 0)
break;
if (i == 3)
{
if (is_new)
dict_unref(d1);
semsg(_(e_invalid_argument_str), action);
return;
}
Expand Down
1 change: 1 addition & 0 deletions src/filepath.c
Original file line number Diff line number Diff line change
Expand Up @@ -2110,6 +2110,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
if (buf == NULL)
{
vim_free(p);
vim_free(remain);
goto fail;
}

Expand Down
3 changes: 3 additions & 0 deletions src/map.c
Original file line number Diff line number Diff line change
Expand Up @@ -2574,7 +2574,10 @@ f_maplist(typval_T *argvars UNUSED, typval_T *rettv)
if ((d = dict_alloc()) == NULL)
return;
if (list_append_dict(rettv->vval.v_list, d) == FAIL)
{
dict_unref(d);
return;
}

keys_buf = NULL;
did_simplify = FALSE;
Expand Down
3 changes: 3 additions & 0 deletions src/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,10 @@ set_string_default_esc(char *name, char_u *val, int escape)

opt_idx = findoption((char_u *)name);
if (opt_idx < 0)
{
vim_free(p);
return;
}

if (options[opt_idx].flags & P_DEF_ALLOCED)
vim_free(options[opt_idx].def_val[VI_DEFAULT]);
Expand Down
6 changes: 6 additions & 0 deletions src/testdir/test_listdict.vim
Original file line number Diff line number Diff line change
Expand Up @@ -1530,4 +1530,10 @@ func Test_indexof()
delfunc TestIdx
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
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
341,
/**/
340,
/**/
Expand Down

0 comments on commit 29269a7

Please sign in to comment.