From 7d2458e51c639071fdc2cf6c21ca5c510a19c16f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 12 May 2016 12:58:46 +0200 Subject: [PATCH] vpn: fix crash when VPN service times-out to start Previously, we took a reference when scheduling _daemon_exec_timeout(). That was changed, but we still wrongly unref'ed the VPN connection on timeout. Related: https://bugzilla.gnome.org/show_bug.cgi?id=766307 Fixes: 6c12f04e87b439832bdbac57bc8bd85e369a0bc9 (cherry picked from commit 1ec5e0b9584a398333e5522e053f77d941fd5c4f) --- src/vpn-manager/nm-vpn-connection.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index a1cd0c3289..31b94752af 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -1916,9 +1916,6 @@ _daemon_exec_timeout (gpointer data) _LOGW ("Timed out waiting for the service to start"); priv->start_timeout = 0; nm_vpn_connection_disconnect (self, NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT, FALSE); - - g_object_unref (self); - return G_SOURCE_REMOVE; }