Mercurial > vim
changeset 22876:b952e0a3af2f v8.2.1985
patch 8.2.1985: crash when closing terminal popup with <Cmd> mapping
Commit: https://github.com/vim/vim/commit/02764713a715c55e316e2bef5c9ade2fb767ee78
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 14 20:21:55 2020 +0100
patch 8.2.1985: crash when closing terminal popup with <Cmd> mapping
Problem: Crash when closing terminal popup with <Cmd> mapping.
Solution: Check b_term is not NULL. (closes https://github.com/vim/vim/issues/7294)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 14 Nov 2020 20:30:03 +0100 |
parents | ef23eb1c4b79 |
children | 622f09a8ac9e |
files | src/terminal.c src/testdir/test_terminal.vim src/version.c |
diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/terminal.c +++ b/src/terminal.c @@ -2527,7 +2527,7 @@ terminal_loop(int blocking) while (blocking || vpeekc_nomap() != NUL) { #ifdef FEAT_GUI - if (!curbuf->b_term->tl_system) + if (curbuf->b_term != NULL && !curbuf->b_term->tl_system) #endif // TODO: skip screen update when handling a sequence of keys. // Repeat redrawing in case a message is received while redrawing. @@ -2542,8 +2542,6 @@ terminal_loop(int blocking) restore_cursor = TRUE; raw_c = term_vgetc(); -if (raw_c > 0) - ch_log(NULL, "terminal_loop() got %d", raw_c); if (!term_use_loop_check(TRUE) || in_terminal_loop != curbuf->b_term) { // Job finished while waiting for a character. Push back the
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1225,6 +1225,18 @@ func Test_open_term_from_cmd() call delete('Xopenterm') endfunc +func Test_terminal_popup_with_cmd() + " this was crashing + let buf = term_start(&shell, #{hidden: v:true}) + let s:winid = popup_create(buf, {}) + tnoremap <F3> <Cmd>call popup_close(s:winid)<CR> + call feedkeys("\<F3>", 'xt') + + tunmap <F3> + exe 'bwipe! ' .. buf + unlet s:winid +endfunc + func Check_dump01(off) call assert_equal('one two three four five', trim(getline(a:off + 1))) call assert_equal('~ Select Word', trim(getline(a:off + 7)))