Mercurial > vim
changeset 22178:6666ace75ef5 v8.2.1638
patch 8.2.1638: leaking memory when popup filter function can't be called
Commit: https://github.com/vim/vim/commit/8e9be208ea58149c4e522166a6194da18a2eced7
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 8 22:55:26 2020 +0200
patch 8.2.1638: leaking memory when popup filter function can't be called
Problem: Leaking memory when popup filter function can't be called.
Solution: Don't return too soon.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 08 Sep 2020 23:00:04 +0200 |
parents | ac6d1eecb47d |
children | 85eb6ecfb2e8 |
files | src/popupwin.c src/version.c |
diffstat | 2 files changed, 25 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -3155,31 +3155,33 @@ invoke_popup_filter(win_T *wp, int c) if (call_callback(&wp->w_filter_cb, -1, &rettv, 2, argv) == FAIL) { // 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); - return 1; - } - - if (win_valid_popup(wp) && old_lnum != wp->w_cursor.lnum) - popup_highlight_curline(wp); - - // If an error was given always return FALSE, so that keys are not - // consumed and the user can type something. - // If we get three errors in a row then close the popup. Decrement the - // error count by 1/10 if there are no errors, thus allowing up to 1 in - // 10 calls to cause an error. - if (win_valid_popup(wp) && called_emsg > prev_called_emsg) - { - wp->w_filter_errors += 10; - if (wp->w_filter_errors >= 30) - popup_close_with_retval(wp, -1); - res = FALSE; + res = TRUE; } else { - if (win_valid_popup(wp) && wp->w_filter_errors > 0) - --wp->w_filter_errors; - res = tv_get_bool(&rettv); + if (win_valid_popup(wp) && old_lnum != wp->w_cursor.lnum) + popup_highlight_curline(wp); + + // If an error was given always return FALSE, so that keys are not + // consumed and the user can type something. + // If we get three errors in a row then close the popup. Decrement the + // error count by 1/10 if there are no errors, thus allowing up to 1 in + // 10 calls to cause an error. + if (win_valid_popup(wp) && called_emsg > prev_called_emsg) + { + wp->w_filter_errors += 10; + if (wp->w_filter_errors >= 30) + popup_close_with_retval(wp, -1); + res = FALSE; + } + else + { + if (win_valid_popup(wp) && wp->w_filter_errors > 0) + --wp->w_filter_errors; + res = tv_get_bool(&rettv); + } } vim_free(argv[1].vval.v_string);