From 9d291821f219aecbeef963d593570a720c60e341 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Sun, 10 Feb 2019 13:41:37 +0100 Subject: [PATCH] ovs: don't leak a GCancellable on connection failure Every time we clear priv->client we should also clear the cancellable or it will be leaked. Fixes: 830a5a14cb29ca00b73a9623c1ea7c5cd92f4d00 (cherry picked from commit b92f2c932310e0ab2c94af9824f2e683af773204) --- src/devices/ovs/nm-ovsdb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c index 403a4c07b7..6536971102 100644 --- a/src/devices/ovs/nm-ovsdb.c +++ b/src/devices/ovs/nm-ovsdb.c @@ -1309,6 +1309,7 @@ ovsdb_disconnect (NMOvsdb *self, gboolean is_disposing) g_clear_object (&priv->client); g_clear_object (&priv->conn); g_clear_pointer (&priv->db_uuid, g_free); + nm_clear_g_cancellable (&priv->cancellable); } static void @@ -1541,9 +1542,6 @@ dispose (GObject *object) g_clear_pointer (&priv->ports, g_hash_table_destroy); g_clear_pointer (&priv->interfaces, g_hash_table_destroy); - g_cancellable_cancel (priv->cancellable); - g_clear_object (&priv->cancellable); - G_OBJECT_CLASS (nm_ovsdb_parent_class)->dispose (object); }