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 #7294)
diff --git a/src/terminal.c b/src/terminal.c
index 4e2ff14..7f38bf7 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2527,7 +2527,7 @@
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 @@
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
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 137a8a6..8d68ceb 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1225,6 +1225,18 @@
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)))
diff --git a/src/version.c b/src/version.c
index 8d21a4a..8174386 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1985,
+/**/
1984,
/**/
1983,