luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusconnection: Drop an unnecessary GMainContext reference

Browse Source 
`CallDestroyNotifyData` never uses that `GMainContext`, and holding a
ref to it could cause reference count cycles if the `GMainContext` is no
longer being iterated.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1515
This commit is contained in:
Philip Withnall 2020-02-20 12:40:30 +00:00
parent cc11c79e4b
commit bcee182a49
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbusconnection.c
View File

@ -222,7 +222,6 @@ typedef struct
{ {
GDestroyNotify callback; GDestroyNotify callback;
gpointer user_data; gpointer user_data;
GMainContext *context;
} CallDestroyNotifyData; } CallDestroyNotifyData;
static gboolean static gboolean
@ -236,8 +235,6 @@ call_destroy_notify_data_in_idle (gpointer user_data)
static void static void
call_destroy_notify_data_free (CallDestroyNotifyData *data) call_destroy_notify_data_free (CallDestroyNotifyData *data)
{ {
if (data->context != NULL)
g_main_context_unref (data->context);
g_free (data); g_free (data);
} }
@ -263,9 +260,6 @@ call_destroy_notify (GMainContext *context,
data = g_new0 (CallDestroyNotifyData, 1); data = g_new0 (CallDestroyNotifyData, 1);
data->callback = callback; data->callback = callback;
data->user_data = user_data; data->user_data = user_data;
data->context = context;
if (data->context != NULL)
g_main_context_ref (data->context);
idle_source = g_idle_source_new (); idle_source = g_idle_source_new ();
g_source_set_priority (idle_source, G_PRIORITY_DEFAULT); g_source_set_priority (idle_source, G_PRIORITY_DEFAULT);
@ -274,7 +268,7 @@ call_destroy_notify (GMainContext *context,
data, data,
(GDestroyNotify) call_destroy_notify_data_free); (GDestroyNotify) call_destroy_notify_data_free);
g_source_set_name (idle_source, "[gio] call_destroy_notify_data_in_idle"); g_source_set_name (idle_source, "[gio] call_destroy_notify_data_in_idle");
g_source_attach (idle_source, data->context); g_source_attach (idle_source, context);
g_source_unref (idle_source); g_source_unref (idle_source);
out: out: