xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of local client quitting during its creation

Browse Source 
If the local client was quitted during its creation (using -e quit
for example), we could have been accessing a null pointer afterwards.

Make the rest of the code aware that local_client might be null.
This commit is contained in:
Maxime Coste 2018-04-19 07:56:37 +10:00
parent 0f38be544c
commit c2759ac526
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cc
View File

@ -669,13 +669,13 @@ int run_server(StringView session, StringView server_init,
create_local_ui(ui_type), getpid(), {}, get_env_vars(), client_init, std::move(init_coord), create_local_ui(ui_type), getpid(), {}, get_env_vars(), client_init, std::move(init_coord),
[](int status) { local_client_exit = status; }); [](int status) { local_client_exit = status; });
if (startup_error) if (startup_error and local_client)
local_client->print_status({ local_client->print_status({
"error during startup, see *debug* buffer for details", "error during startup, see *debug* buffer for details",
local_client->context().faces()["Error"] local_client->context().faces()["Error"]
}); });
if (flags & ServerFlags::StartupInfo) if (flags & ServerFlags::StartupInfo and local_client)
local_client->info_show(format("Kakoune {}", version), startup_info, {}, InfoStyle::Prompt); local_client->info_show(format("Kakoune {}", version), startup_info, {}, InfoStyle::Prompt);
} }
@ -691,7 +691,7 @@ int run_server(StringView session, StringView server_init,
client_manager.clear_window_trash(); client_manager.clear_window_trash();
buffer_manager.clear_buffer_trash(); buffer_manager.clear_buffer_trash();
if (sighup_raised) if (sighup_raised and local_client)
{ {
ClientManager::instance().remove_client(*local_client, false, 0); ClientManager::instance().remove_client(*local_client, false, 0);
if (not client_manager.empty() and fork_server_to_background()) if (not client_manager.empty() and fork_server_to_background())
@ -700,6 +700,7 @@ int run_server(StringView session, StringView server_init,
} }
else if (convert_to_client_pending) else if (convert_to_client_pending)
{ {
kak_assert(local_client);
const String client_name = local_client->context().name(); const String client_name = local_client->context().name();
const String buffer_name = local_client->context().buffer().name(); const String buffer_name = local_client->context().buffer().name();
const String selections = selection_list_to_string(local_client->context().selections()); const String selections = selection_list_to_string(local_client->context().selections());