[glib] gio: avoid g_object_ref(NULL) in g_dbus_object_manager_client_finalize



commit f62c8fce8e7f9ae102de308941423006e419cdf3
Author: SyncEvolution Nightly Testing <syncevolution syncevolution org>
Date:   Thu Jul 10 09:52:26 2014 +0000

    gio: avoid g_object_ref(NULL) in g_dbus_object_manager_client_finalize
    
    When establishing a D-Bus connection failed, g_dbus_object_manager_client_finalize()
    calls g_object_ref(manager->priv->connection) when that pointer is NULL,
    which is considered and logged as error by glib.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732984

 gio/gdbusobjectmanagerclient.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index e90ecb1..5755e74 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -204,7 +204,8 @@ g_dbus_object_manager_client_finalize (GObject *object)
                                             manager);
       g_object_unref (manager->priv->control_proxy);
     }
-  g_object_unref (manager->priv->connection);
+  if (manager->priv->connection != NULL)
+    g_object_unref (manager->priv->connection);
   g_free (manager->priv->object_path);
   g_free (manager->priv->name);
   g_free (manager->priv->name_owner);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]