luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug-787-investigation' into 'master'

Browse Source 
Fix memory error with GDBusConnection in g_test_dbus_down()

Closes #787

See merge request GNOME/glib!963
This commit is contained in:
Philip Withnall 2019-07-05 11:52:28 +00:00
commit 4e538e674c
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gtestdbus.c
View File

@ -67,15 +67,14 @@ on_weak_notify_timeout (gpointer user_data)
} }
static gboolean static gboolean
dispose_on_idle (gpointer object) unref_on_idle (gpointer object)
{ {
g_object_run_dispose (object);
g_object_unref (object); g_object_unref (object);
return FALSE; return FALSE;
} }
static gboolean static gboolean
_g_object_dispose_and_wait_weak_notify (gpointer object) _g_object_unref_and_wait_weak_notify (gpointer object)
{ {
WeakNotifyData data; WeakNotifyData data;
guint timeout_id; guint timeout_id;
@ -85,9 +84,10 @@ _g_object_dispose_and_wait_weak_notify (gpointer object)
g_object_weak_ref (object, (GWeakNotify) g_main_loop_quit, data.loop); g_object_weak_ref (object, (GWeakNotify) g_main_loop_quit, data.loop);
/* Drop the ref in an idle callback, this is to make sure the mainloop /* Drop the strong ref held by the caller in an idle callback. This is to
* is already running when weak notify happens */ * make sure the mainloop is already running when weak notify happens (when
g_idle_add (dispose_on_idle, object); * all other strong ref holders have dropped theirs). */
g_idle_add (unref_on_idle, object);
/* Make sure we don't block forever */ /* Make sure we don't block forever */
timeout_id = g_timeout_add (30 * 1000, on_weak_notify_timeout, &data); timeout_id = g_timeout_add (30 * 1000, on_weak_notify_timeout, &data);
@ -820,7 +820,7 @@ g_test_dbus_down (GTestDBus *self)
stop_daemon (self); stop_daemon (self);
if (connection != NULL) if (connection != NULL)
_g_object_dispose_and_wait_weak_notify (connection); _g_object_unref_and_wait_weak_notify (connection);
g_test_dbus_unset (); g_test_dbus_unset ();
_g_bus_forget_singleton (G_BUS_TYPE_SESSION); _g_bus_forget_singleton (G_BUS_TYPE_SESSION);

3
gio/tests/gdbus-connection-loss.c
View File

@ -136,9 +136,10 @@ main (int argc,
ret = g_test_run(); ret = g_test_run();
g_object_unref (c);
session_bus_down (); session_bus_down ();
g_object_unref (c);
g_main_loop_unref (loop); g_main_loop_unref (loop);
return ret; return ret;

3
gio/tests/gdbus-names.c
View File

@ -472,9 +472,6 @@ test_bus_own_name (void)
g_object_unref (c2); g_object_unref (c2);
session_bus_down (); session_bus_down ();
/* See https://bugzilla.gnome.org/show_bug.cgi?id=711807 */
g_usleep (1000000);
} }
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */