From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 10 Feb 2020 19:34:04 +0000 (+0100)
Subject: patch 8.2.0237: crash when setting 'wincolor' on finished terminal window
X-Git-Tag: v8.2.0237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ba3b91e0385c848c773e2f2d803db01730e7786;p=vim

patch 8.2.0237: crash when setting 'wincolor' on finished terminal window

Problem:    Crash when setting 'wincolor' on finished terminal window.
            (Bakudankun)
Solution:   Check that the vterm is not NULL. (Yasuhiro Matsumoto, closes
            #5607, closes #5610)
---

diff --git a/src/terminal.c b/src/terminal.c
index cbf8fe079..10bfae842 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -4276,6 +4276,8 @@ term_update_colors(void)
 {
     term_T *term = curwin->w_buffer->b_term;
 
+    if (term->tl_vterm == NULL)
+	return;
     init_default_colors(term, curwin);
     vterm_state_set_default_colors(
 	    vterm_obtain_state(term->tl_vterm),
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 0963405e8..8c1d3572a 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2370,3 +2370,18 @@ func Test_terminal_in_popup()
   call StopVimInTerminal(buf)
   call delete('XtermPopup')
 endfunc
+
+func Test_issue_5607()
+  let wincount = winnr('$')
+  exe 'terminal' &shell &shellcmdflag 'exit'
+  let job = term_getjob(bufnr())
+  call WaitForAssert({-> assert_equal("dead", job_status(job))})
+
+  let old_wincolor = &wincolor
+  try
+    set wincolor=
+  finally
+    let &wincolor = old_wincolor
+    bw!
+  endtry
+endfunc
diff --git a/src/version.c b/src/version.c
index 7ca6baacf..7c48e0bdc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    237,
 /**/
     236,
 /**/