aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1638: leaking memory when popup filter function can't be called

Browse Source 
Problem:    Leaking memory when popup filter function can't be called.
Solution:   Don't return too soon.
This commit is contained in:
Bram Moolenaar
2020-09-08 22:55:26 +02:00
parent c3516f7e45
commit 8e9be208ea
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/popupwin.c
View File

@@ -3155,11 +3155,12 @@ invoke_popup_filter(win_T *wp, int c)
if (call_callback(&wp->w_filter_cb, -1, &rettv, 2, argv) == FAIL) if (call_callback(&wp->w_filter_cb, -1, &rettv, 2, argv) == FAIL)
{ {
// Cannot call the function, close the popup to avoid that the filter // Cannot call the function, close the popup to avoid that the filter
// eats keys and the user can't get out. // eats keys and the user is stuck. Might as well eat the key.
popup_close_with_retval(wp, -1); popup_close_with_retval(wp, -1);
return 1; res = TRUE;
} }
else
{
if (win_valid_popup(wp) && old_lnum != wp->w_cursor.lnum) if (win_valid_popup(wp) && old_lnum != wp->w_cursor.lnum)
popup_highlight_curline(wp); popup_highlight_curline(wp);
@@ -3181,6 +3182,7 @@ invoke_popup_filter(win_T *wp, int c)
--wp->w_filter_errors; --wp->w_filter_errors;
res = tv_get_bool(&rettv); res = tv_get_bool(&rettv);
} }
}
vim_free(argv[1].vval.v_string); vim_free(argv[1].vval.v_string);
clear_tv(&rettv); clear_tv(&rettv);

2
src/version.c
View File

@@ -754,6 +754,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 */
/**/
1638,
/**/ /**/
1637, 1637,
/**/ /**/