Skip to content

Commit

Permalink
patch 8.2.0399: various memory leaks
Browse files Browse the repository at this point in the history
Problem:    Various memory leaks.
Solution:   Avoid the leaks. (Ozaki Kiichi, closes vim#5803)
  • Loading branch information
brammool committed Mar 18, 2020
1 parent a21df1d commit 292b90d
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 4 deletions.
12 changes: 12 additions & 0 deletions src/ex_docmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,18 @@ do_cmdline(
restore_dbg_stuff(&debug_saved);

msg_list = saved_msg_list;

// Cleanup if "cs_emsg_silent_list" remains.
if (cstack.cs_emsg_silent_list != NULL)
{
eslist_T *elem, *temp;

for (elem = cstack.cs_emsg_silent_list; elem != NULL; elem = temp)
{
temp = elem->next;
vim_free(elem);
}
}
#endif // FEAT_EVAL

/*
Expand Down
1 change: 1 addition & 0 deletions src/ex_getln.c
Original file line number Diff line number Diff line change
Expand Up @@ -4188,6 +4188,7 @@ open_cmdwin(void)
if (win_split((int)p_cwh, WSP_BOT) == FAIL)
{
beep_flush();
ga_clear(&winsizes);
return K_IGNORE;
}
cmdwin_type = get_cmdline_type();
Expand Down
10 changes: 8 additions & 2 deletions src/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2882,10 +2882,16 @@ menuitem_getinfo(vimmenu_T *menu, int modes, dict_T *dict)
if (bit < MENU_MODES) // just in case, avoid Coverity warning
{
if (menu->strings[bit] != NULL)
{
char_u *tofree = NULL;

status = dict_add_string(dict, "rhs",
*menu->strings[bit] == NUL
? vim_strsave((char_u *)"<Nop>")
: str2special_save(menu->strings[bit], FALSE));
? (char_u *)"<Nop>"
: (tofree = str2special_save(
menu->strings[bit], FALSE)));
vim_free(tofree);
}
if (status == OK)
status = dict_add_bool(dict, "noremenu",
menu->noremap[bit] == REMAP_NONE);
Expand Down
1 change: 1 addition & 0 deletions src/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@ emsg_namelen(char *msg, char_u *name, int len)
char_u *copy = vim_strnsave((char_u *)name, len);

semsg(msg, copy == NULL ? "NULL" : (char *)copy);
vim_free(copy);
}

/*
Expand Down
3 changes: 2 additions & 1 deletion src/scriptfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,8 @@ do_source(
{
// Already loaded and no need to load again, return here.
*ret_sid = sid;
return OK;
retval = OK;
goto theend;
}
#endif

Expand Down
4 changes: 3 additions & 1 deletion src/userfunc.c
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,8 @@ func_clear_items(ufunc_T *fp)
ga_clear_strings(&(fp->uf_lines));
VIM_CLEAR(fp->uf_name_exp);
VIM_CLEAR(fp->uf_arg_types);
VIM_CLEAR(fp->uf_def_arg_idx);
VIM_CLEAR(fp->uf_va_name);
ga_clear(&fp->uf_type_list);
#ifdef FEAT_PROFILE
VIM_CLEAR(fp->uf_tml_count);
Expand Down Expand Up @@ -3086,11 +3088,11 @@ ex_function(exarg_T *eap)

erret:
ga_clear_strings(&newargs);
ga_clear_strings(&argtypes);
ga_clear_strings(&default_args);
errret_2:
ga_clear_strings(&newlines);
ret_free:
ga_clear_strings(&argtypes);
vim_free(skip_until);
vim_free(line_to_free);
vim_free(fudi.fd_newkey);
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,8 @@ static char *(features[]) =

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

0 comments on commit 292b90d

Please sign in to comment.