luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

gsocketclient: Fix passing NULL to g_task_get_cancellable()

Browse Source 
Fix a regression from commit abddb42d14, where it could pass `NULL` to
`g_task_get_cancellable()`, triggering a critical warning. This could
happen because the lifetime of `data->task` is not as long as the
lifetime of the `ConnectionAttempt`, but the code assumed it was.

Fix the problem by keeping a strong ref to that `GCancellable` around
until the `ConnectionAttempt` is finished being destroyed.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2687
This commit is contained in:
Philip Withnall 2022-07-12 16:07:23 +01:00
parent 776719234a
commit 99783e0408
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gsocketclient.c
View File

@ -1508,6 +1508,7 @@ typedef struct
GSocketClientAsyncConnectData *data; /* unowned */ GSocketClientAsyncConnectData *data; /* unowned */
GSource *timeout_source; GSource *timeout_source;
GCancellable *cancellable; GCancellable *cancellable;
GCancellable *task_cancellable; /* (owned); this is equal to g_task_get_cancellable (ConnectionAttempt.data->task), but with a longer lifetime */
gulong cancelled_id; gulong cancelled_id;
grefcount ref; grefcount ref;
} ConnectionAttempt; } ConnectionAttempt;
@ -1536,7 +1537,8 @@ connection_attempt_unref (gpointer pointer)
g_clear_object (&attempt->address); g_clear_object (&attempt->address);
g_clear_object (&attempt->socket); g_clear_object (&attempt->socket);
g_clear_object (&attempt->connection); g_clear_object (&attempt->connection);
g_cancellable_disconnect (g_task_get_cancellable (attempt->data->task), attempt->cancelled_id); g_cancellable_disconnect (attempt->task_cancellable, attempt->cancelled_id);
g_clear_object (&attempt->task_cancellable);
attempt->cancelled_id = 0; attempt->cancelled_id = 0;
g_clear_object (&attempt->cancellable); g_clear_object (&attempt->cancellable);
g_clear_object (&attempt->proxy_addr); g_clear_object (&attempt->proxy_addr);
@ -2031,9 +2033,12 @@ g_socket_client_enumerator_callback (GObject *object,
data->connection_attempts = g_slist_append (data->connection_attempts, attempt); data->connection_attempts = g_slist_append (data->connection_attempts, attempt);
if (g_task_get_cancellable (data->task)) if (g_task_get_cancellable (data->task))
attempt->cancelled_id = {
g_cancellable_connect (g_task_get_cancellable (data->task), G_CALLBACK (on_connection_cancelled), attempt->task_cancellable = g_object_ref (g_task_get_cancellable (data->task));
g_object_ref (attempt->cancellable), g_object_unref); attempt->cancelled_id =
g_cancellable_connect (attempt->task_cancellable, G_CALLBACK (on_connection_cancelled),
g_object_ref (attempt->cancellable), g_object_unref);
}
g_socket_connection_set_cached_remote_address ((GSocketConnection *)attempt->connection, address); g_socket_connection_set_cached_remote_address ((GSocketConnection *)attempt->connection, address);
g_debug ("GSocketClient: Starting TCP connection attempt"); g_debug ("GSocketClient: Starting TCP connection attempt");