4 files changed, 26 insertions, 20 deletions
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 55ef254a63..cefb603a7e 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -158,8 +158,7 @@ describe('terminal buffer', function()
   end)
 
   it('handles loss of focus gracefully', function()
-    -- Temporarily change the statusline to avoid printing the file name, which
-    -- varies be where the test is run.
+    -- Change the statusline to avoid printing the file name, which varies.
     nvim('set_option', 'statusline', '==========')
     execute('set laststatus=0')
 
@@ -195,5 +194,15 @@ describe('terminal buffer', function()
 
     execute('set laststatus=1')  -- Restore laststatus to the default.
   end)
+
+  it('term_close() use-after-free #4393', function()
+    if eval("executable('yes')") == 0 then
+      pending('missing "yes" command')
+      return
+    end
+    execute('terminal yes')
+    feed([[<C-\><C-n>]])
+    execute('bdelete!')
+  end)
 end)
 
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 493539b4d3..d89092ff27 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -1,15 +1,15 @@
 local helpers = require('test.functional.helpers')
 local Screen = require('test.functional.ui.screen')
 local clear, wait, nvim = helpers.clear, helpers.wait, helpers.nvim
-local nvim_dir = helpers.nvim_dir
-local execute = helpers.execute
+local nvim_dir, source, eq = helpers.nvim_dir, helpers.source, helpers.eq
+local execute, eval = helpers.execute, helpers.eval
 
 describe(':terminal', function()
   local screen
 
   before_each(function()
     clear()
-    screen = Screen.new(50, 7)
+    screen = Screen.new(50, 4)
     screen:attach(false)
     nvim('set_option', 'shell', nvim_dir..'/shell-test')
     nvim('set_option', 'shellcmdflag', 'EXE')
@@ -23,9 +23,6 @@ describe(':terminal', function()
       ready $                                           |
       [Process exited 0]                                |
                                                         |
-                                                        |
-                                                        |
-                                                        |
       -- TERMINAL --                                    |
     ]])
   end)
@@ -37,9 +34,6 @@ describe(':terminal', function()
       ready $ echo hi                                   |
                                                         |
       [Process exited 0]                                |
-                                                        |
-                                                        |
-                                                        |
       -- TERMINAL --                                    |
     ]])
   end)
@@ -51,10 +45,15 @@ describe(':terminal', function()
       ready $ echo 'hello' \ "world"                    |
                                                         |
       [Process exited 0]                                |
-                                                        |
-                                                        |
-                                                        |
       -- TERMINAL --                                    |
     ]])
   end)
+
+  it('ex_terminal() double-free #4554', function()
+    source([[
+      autocmd BufNew * set shell=foo
+      terminal]])
+      -- Verify that BufNew actually fired (else the test is invalid).
+    eq('foo', eval('&shell'))
+  end)
 end)
diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 045f5aa42f..97875c5147 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -25,7 +25,7 @@ describe('terminal window highlighting', function()
       [5] = {background = 11},
       [6] = {foreground = 130},
       [7] = {reverse = true},
-      [8] = {background = 11}
+      [8] = {background = 11},
     })
     screen:attach(false)
     execute('enew | call termopen(["'..nvim_dir..'/tty-test"]) | startinsert')
@@ -121,7 +121,7 @@ describe('terminal window highlighting with custom palette', function()
     clear()
     screen = Screen.new(50, 7)
     screen:set_default_attr_ids({
-      [1] = {foreground = 1193046}
+      [1] = {foreground = 1193046, special = Screen.colors.Black}
     })
     screen:set_default_attr_ignore({
       [1] = {bold = true},
@@ -130,7 +130,7 @@ describe('terminal window highlighting with custom palette', function()
       [5] = {background = 11},
       [6] = {foreground = 130},
       [7] = {reverse = true},
-      [8] = {background = 11}
+      [8] = {background = 11},
     })
     screen:attach(true)
     nvim('set_var', 'terminal_color_3', '#123456')
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 48376a344f..364ca327a4 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -154,9 +154,7 @@ describe('tui', function()
     for i = 1, 3000 do
       t[i] = 'item ' .. tostring(i)
     end
-    feed('i\027[200~')
-    feed(table.concat(t, '\n'))
-    feed('\027[201~')
+    feed('i\027[200~'..table.concat(t, '\n')..'\027[201~')
     screen:expect([[
       item 2997                                         |
       item 2998                                         |