luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 08:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2670-socket-client-cancellable-leak' into 'main'

Browse Source 
gsocketclient: Fix still-reachable references to cancellables

Closes #2670

See merge request GNOME/glib!2745
This commit is contained in:
Philip Withnall 2022-06-14 14:12:51 +00:00
commit 9274a04cf1
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gsocketclient.c
View File

@ -1466,6 +1466,8 @@ typedef struct
GSocketConnectable *connectable; GSocketConnectable *connectable;
GSocketAddressEnumerator *enumerator; GSocketAddressEnumerator *enumerator;
GCancellable *enumeration_cancellable; GCancellable *enumeration_cancellable;
GCancellable *enumeration_parent_cancellable; /* (nullable) (owned) */
gulong enumeration_cancelled_id;
GSList *connection_attempts; GSList *connection_attempts;
GSList *successful_connections; GSList *successful_connections;
@ -1485,7 +1487,12 @@ g_socket_client_async_connect_data_free (GSocketClientAsyncConnectData *data)
data->task = NULL; data->task = NULL;
g_clear_object (&data->connectable); g_clear_object (&data->connectable);
g_clear_object (&data->enumerator); g_clear_object (&data->enumerator);
g_cancellable_disconnect (data->enumeration_parent_cancellable, data->enumeration_cancelled_id);
g_clear_object (&data->enumeration_parent_cancellable);
data->enumeration_cancelled_id = 0;
g_clear_object (&data->enumeration_cancellable); g_clear_object (&data->enumeration_cancellable);
g_slist_free_full (data->connection_attempts, connection_attempt_unref); g_slist_free_full (data->connection_attempts, connection_attempt_unref);
g_slist_free_full (data->successful_connections, connection_attempt_unref); g_slist_free_full (data->successful_connections, connection_attempt_unref);
@ -1503,6 +1510,7 @@ typedef struct
GSocketClientAsyncConnectData *data; /* unowned */ GSocketClientAsyncConnectData *data; /* unowned */
GSource *timeout_source; GSource *timeout_source;
GCancellable *cancellable; GCancellable *cancellable;
gulong cancelled_id;
grefcount ref; grefcount ref;
} ConnectionAttempt; } ConnectionAttempt;
@ -1530,6 +1538,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);
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);
if (attempt->timeout_source) if (attempt->timeout_source)
@ -2023,6 +2033,7 @@ 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), g_cancellable_connect (g_task_get_cancellable (data->task), G_CALLBACK (on_connection_cancelled),
g_object_ref (attempt->cancellable), g_object_unref); g_object_ref (attempt->cancellable), g_object_unref);
@ -2129,8 +2140,12 @@ g_socket_client_connect_async (GSocketClient *client,
data->enumeration_cancellable = g_cancellable_new (); data->enumeration_cancellable = g_cancellable_new ();
if (cancellable) if (cancellable)
{
data->enumeration_parent_cancellable = g_object_ref (cancellable);
data->enumeration_cancelled_id =
g_cancellable_connect (cancellable, G_CALLBACK (on_connection_cancelled), g_cancellable_connect (cancellable, G_CALLBACK (on_connection_cancelled),
g_object_ref (data->enumeration_cancellable), g_object_unref); g_object_ref (data->enumeration_cancellable), g_object_unref);
}
enumerator_next_async (data, FALSE); enumerator_next_async (data, FALSE);
} }