fixup! manager: fix race subscribing prop_filter()th/prop-filter-bgo753874

1 files changed, 14 insertions, 1 deletions

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 8665a4be91..9a2a3e7740 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4588,11 +4588,24 @@ prop_filter (GDBusConnection *connection,
 
 /******************************************************************************/
 
+static int
+_set_prop_filter_free2 (gpointer user_data)
+{
+	g_slice_free (GWeakRef, user_data);
+	return G_SOURCE_REMOVE;
+}
+
 static void
 _set_prop_filter_free (gpointer user_data)
 {
 	g_weak_ref_clear (user_data);
-	g_slice_free (GWeakRef, user_data);
+
+	/* Delay the final deletion of the user_data. There is a race when
+	 * calling g_dbus_connection_remove_filter() that the callback and user_data
+	 * might have been copied and being executed after the destroy function
+	 * runs.
+	 * This doesn't really fix the race, but it should work well enough. */
+	g_idle_add (_set_prop_filter_free2, user_data);
 }
 
 static void