brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polkit: Only unregister registered handles

Browse Source 
If the initialization fails for some reason, for example by
running 'gnome-shell --replace', we should not crash because
of an attempt of unregistering an unregistered agent handle.

Fix that by checking if the handle is not NULL before calling
the unregistering routines.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/66
This commit is contained in:
Georges Basile Stavracas Neto 2018-03-22 11:11:38 -03:00
parent 72fa44d0fd
commit 127ba318fd
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell-polkit-authentication-agent.c
View File

@ -318,9 +318,12 @@ shell_polkit_authentication_agent_unregister (ShellPolkitAuthenticationAgent *ag
if (agent->current_request != NULL) if (agent->current_request != NULL)
auth_request_dismiss (agent->current_request); auth_request_dismiss (agent->current_request);
if (agent->handle)
{
polkit_agent_listener_unregister (agent->handle); polkit_agent_listener_unregister (agent->handle);
agent->handle = NULL; agent->handle = NULL;
} }
}
static void maybe_process_next_request (ShellPolkitAuthenticationAgent *agent); static void maybe_process_next_request (ShellPolkitAuthenticationAgent *agent);