diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-02-02 10:05:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 10:05:03 +0800 |
| commit | 2c5906b55bb6092121f4d3b032d5449da7675c2b (patch) | |
| tree | 12bc52db168cb9ecd5bb743c9b8013b4637ad260 | |
| parent | ecc1595c7b81987ca9d6265d1e08ef37a05c95bf (diff) | |
| download | rneovim-2c5906b55bb6092121f4d3b032d5449da7675c2b.tar.gz rneovim-2c5906b55bb6092121f4d3b032d5449da7675c2b.tar.bz2 rneovim-2c5906b55bb6092121f4d3b032d5449da7675c2b.zip | |
fix(exit): skip unnecessary steps in TUI preserve_exit() (#21897)
This prevents the TUI from doing unexpected things when receiving a
deadly signal or running out of memory.
| -rw-r--r-- | src/nvim/main.c | 5 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 3 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 8df82c710a..e26922bf8e 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -811,6 +811,11 @@ void preserve_exit(void) really_exiting = true; // Ignore SIGHUP while we are already exiting. #9274 signal_reject_deadly(); + + if (ui_client_channel_id) { + os_exit(1); + } + os_errmsg(IObuff); os_errmsg("\n"); ui_flush(); diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index a50e44f7a3..ceda3b2076 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -458,6 +458,9 @@ static void tui_terminal_stop(TUIData *tui) void tui_stop(TUIData *tui) { + if (tui->stopped) { + return; + } tui_terminal_stop(tui); stream_set_blocking(tui->input.in_fd, true); // normalize stream (#2598) tinput_destroy(&tui->input); diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index b28728057f..1d9e7b8e11 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -14,6 +14,7 @@ local clear = helpers.clear local command = helpers.command local dedent = helpers.dedent local exec = helpers.exec +local exec_lua = helpers.exec_lua local testprg = helpers.testprg local retry = helpers.retry local nvim_prog = helpers.nvim_prog @@ -1506,6 +1507,11 @@ describe('TUI', function() {3:-- TERMINAL --} | ]]} end) + + it('no assert failure on deadly signal #21896', function() + exec_lua([[vim.loop.kill(vim.fn.jobpid(vim.bo.channel), 'sigterm')]]) + screen:expect({any = '%[Process exited 1%]'}) + end) end) describe('TUI', function() |