Mercurial > vim
changeset 18868:5fbb167591fc v8.1.2420
patch 8.1.2420: crash when calling popup_close() in win_execute()
Commit: https://github.com/vim/vim/commit/4954019c93a2bb5a0b1af54b5961c933beeb56f4
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 11 19:34:54 2019 +0100
patch 8.1.2420: crash when calling popup_close() in win_execute()
Problem: Crash when calling popup_close() in win_execute().
Solution: Disallow popup_close() in popup window. (Yasuhiro Matsumoto,
closes #5345)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 11 Dec 2019 19:45:04 +0100 |
| parents | c9409f359583 |
| children | 6663d5342062 |
| files | src/popupwin.c src/testdir/test_popupwin.vim src/version.c |
| diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -1753,7 +1753,7 @@ popup_create(typval_T *argvars, typval_T // Check that arguments look OK. if (argvars[0].v_type == VAR_NUMBER) { - buf = buflist_findnr( argvars[0].vval.v_number); + buf = buflist_findnr(argvars[0].vval.v_number); if (buf == NULL) { semsg(_(e_nobufnr), argvars[0].vval.v_number); @@ -2097,6 +2097,10 @@ popup_close_and_callback(win_T *wp, typv { int id = wp->w_id; + // Just in case a check higher up is missing. + if (wp == curwin && ERROR_IF_POPUP_WINDOW) + return; + if (wp->w_close_cb.cb_name != NULL) // Careful: This may make "wp" invalid. invoke_popup_callback(wp, arg); @@ -2331,8 +2335,12 @@ find_popup_win(int id) f_popup_close(typval_T *argvars, typval_T *rettv UNUSED) { int id = (int)tv_get_number(argvars); - win_T *wp = find_popup_win(id); - + win_T *wp; + + if (ERROR_IF_POPUP_WINDOW) + return; + + wp = find_popup_win(id); if (wp != NULL) popup_close_and_callback(wp, &argvars[1]); }
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -891,6 +891,10 @@ func Test_win_execute_closing_curwin() let winid = popup_create('some text', {}) call assert_fails('call win_execute(winid, winnr() .. "close")', 'E994') call popup_clear() + + let winid = popup_create('some text', {}) + call assert_fails('call win_execute(winid, printf("normal! :\<C-u>call popup_close(%d)\<CR>", winid))', 'E994') + call popup_clear() endfunc func Test_win_execute_not_allowed()