diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-01-21 18:54:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 18:54:17 +0800 |
| commit | fb805bb8b791b0266072b2415651cb54020d5098 (patch) | |
| tree | baf0d616868ebece976b2e1656588abfdeee4a90 | |
| parent | eec979ca8160ae4230b63d406b2dae4d3e17d500 (diff) | |
| download | rneovim-fb805bb8b791b0266072b2415651cb54020d5098.tar.gz rneovim-fb805bb8b791b0266072b2415651cb54020d5098.tar.bz2 rneovim-fb805bb8b791b0266072b2415651cb54020d5098.zip | |
fix(remote): don't leak memory on failure to connect to server (#21931)
Also fix the race between output and resize in the test for this.
| -rw-r--r-- | src/nvim/main.c | 2 | ||||
| -rw-r--r-- | test/functional/terminal/tui_spec.lua | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 62af56e972..c3f6b6788e 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -885,7 +885,7 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr, os_errmsg("Remote ui failed to start: "); os_errmsg(connect_error); os_errmsg("\n"); - exit(1); + os_exit(1); } ui_client_channel_id = chan; diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 35dc22ae80..b28728057f 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -2410,9 +2410,7 @@ describe("TUI as a client", function() clear() local screen = thelpers.screen_setup(0, string.format([=[["%s", "-u", "NONE", "-i", "NONE", "--server", "127.0.0.1:2436546", "--remote-ui"]]=], - nvim_prog)) - - screen:try_resize(60, 7) + nvim_prog), 60) screen:expect([[ Remote ui failed to start: {MATCH:.*}| |