IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9081 from jamessan/embed-crash

Browse Source 
Fix crash if --embed is used more than once
This commit is contained in:
James McCoy 2018-10-03 10:04:54 -04:00 committed by GitHub
commit 94e585944d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/main.c
View File

@ -258,6 +258,14 @@ int main(int argc, char **argv)
// Process the command line arguments. File names are put in the global // Process the command line arguments. File names are put in the global
// argument list "global_alist". // argument list "global_alist".
command_line_scan(&params); command_line_scan(&params);
if (embedded_mode) {
const char *err;
if (!channel_from_stdio(true, CALLBACK_READER_INIT, &err)) {
abort();
}
}
server_init(params.listen_addr); server_init(params.listen_addr);
if (GARGCOUNT > 0) { if (GARGCOUNT > 0) {
@ -848,10 +856,6 @@ static void command_line_scan(mparm_T *parmp)
headless_mode = true; headless_mode = true;
} else if (STRICMP(argv[0] + argv_idx, "embed") == 0) { } else if (STRICMP(argv[0] + argv_idx, "embed") == 0) {
embedded_mode = true; embedded_mode = true;
const char *err;
if (!channel_from_stdio(true, CALLBACK_READER_INIT, &err)) {
abort();
}
} else if (STRNICMP(argv[0] + argv_idx, "listen", 6) == 0) { } else if (STRNICMP(argv[0] + argv_idx, "listen", 6) == 0) {
want_argument = true; want_argument = true;
argv_idx += 6; argv_idx += 6;

6
test/functional/core/startup_spec.lua
View File

@ -4,6 +4,7 @@ local Screen = require('test.functional.ui.screen')
local clear = helpers.clear local clear = helpers.clear
local command = helpers.command local command = helpers.command
local eq = helpers.eq local eq = helpers.eq
local eval = helpers.eval
local feed = helpers.feed local feed = helpers.feed
local funcs = helpers.funcs local funcs = helpers.funcs
local nvim_prog = helpers.nvim_prog local nvim_prog = helpers.nvim_prog
@ -196,5 +197,10 @@ describe('startup', function()
funcs.system({nvim_prog, '-n', '-es' }, funcs.system({nvim_prog, '-n', '-es' },
{ 'set encoding', '' })) { 'set encoding', '' }))
end) end)
it('does not crash if --embed is given twice', function()
clear{args={'--embed'}}
eq(2, eval('1+1'))
end)
end) end)