From 94d6074e26f9073c5cb2f6fa014fe0d1a0825c29 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 18 Dec 2012 21:06:02 -0600 Subject: [PATCH] core: fix crash on device deactivation after 'pending' branch merge Since the manager now tracks active connections, it needs to hold a reference to the active connection objects too. The active connection teardown code was changed to release that reference (_active_connection_cleanup()) but the creation code was never changed to remove the bits that pass ownership over the initial reference to the NMDevice. Fix that. --- src/nm-manager.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index a4e975a503..061eb7b559 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2334,9 +2334,8 @@ internal_activate_device (NMManager *manager, assumed, device, master_device); - /* Device takes ownership of 'req' */ + g_assert (req); nm_device_activate (device, req); - g_object_unref (req); return NM_ACTIVE_CONNECTION (req); }