colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clients/secret-agent: minor cleanup of child-watch-id for secret-agent

Browse Source 
The code was correct. But it's hard to follow when and whether
the child-watch-id was destroyed at the right time.

Instead, always let _auth_dialog_data_free() clear the signal handlers.
This commit is contained in:
Thomas Haller
2019-01-22 11:46:20 +01:00
parent 8b951afac9
commit d68bdce206
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
clients/common/nm-secret-agent-simple.c
View File

@@ -422,17 +422,21 @@ add_vpn_secrets (RequestData *request,
typedef struct { typedef struct {
GPid auth_dialog_pid; GPid auth_dialog_pid;
char read_buf[5];
GString *auth_dialog_response; GString *auth_dialog_response;
RequestData *request; RequestData *request;
GPtrArray *secrets; GPtrArray *secrets;
guint child_watch_id; GCancellable *cancellable;
gulong cancellable_id; gulong cancellable_id;
guint child_watch_id;
char read_buf[5];
} AuthDialogData; } AuthDialogData;
static void static void
_auth_dialog_data_free (AuthDialogData *data) _auth_dialog_data_free (AuthDialogData *data)
{ {
nm_clear_g_signal_handler (data->cancellable, &data->cancellable_id);
g_clear_object (&data->cancellable);
nm_clear_g_source (&data->child_watch_id);
g_ptr_array_unref (data->secrets); g_ptr_array_unref (data->secrets);
g_spawn_close_pid (data->auth_dialog_pid); g_spawn_close_pid (data->auth_dialog_pid);
g_string_free (data->auth_dialog_response, TRUE); g_string_free (data->auth_dialog_response, TRUE);
@@ -453,7 +457,9 @@ _auth_dialog_exited (GPid pid, int status, gpointer user_data)
int i; int i;
gs_free_error GError *error = NULL; gs_free_error GError *error = NULL;
g_cancellable_disconnect (request->cancellable, data->cancellable_id); data->child_watch_id = 0;
nm_clear_g_cancellable_disconnect (data->cancellable, &data->cancellable_id);
if (status != 0) { if (status != 0) {
g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED, g_set_error (&error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_FAILED,
@@ -522,10 +528,7 @@ out:
static void static void
_request_cancelled (GObject *object, gpointer user_data) _request_cancelled (GObject *object, gpointer user_data)
{ {
AuthDialogData *data = user_data; _auth_dialog_data_free (user_data);
g_source_remove (data->child_watch_id);
_auth_dialog_data_free (data);
} }
static void static void
@@ -549,7 +552,8 @@ _auth_dialog_read_done (GObject *source_object,
/* Done reading. Let's wait for the auth dialog to exit so that we're able to collect the status. /* Done reading. Let's wait for the auth dialog to exit so that we're able to collect the status.
* Remember we can be cancelled in between. */ * Remember we can be cancelled in between. */
data->child_watch_id = g_child_watch_add (data->auth_dialog_pid, _auth_dialog_exited, data); data->child_watch_id = g_child_watch_add (data->auth_dialog_pid, _auth_dialog_exited, data);
data->cancellable_id = g_cancellable_connect (data->request->cancellable, data->cancellable = g_object_ref (data->request->cancellable);
data->cancellable_id = g_cancellable_connect (data->cancellable,
G_CALLBACK (_request_cancelled), data, NULL); G_CALLBACK (_request_cancelled), data, NULL);
break; break;
default: default: