From: SyncEvolution Nightly Testing <syncevolution@syncevolution.org>
Date: Thu, 10 Jul 2014 09:52:26 +0000 (+0000)
Subject: gio: avoid g_object_ref(NULL) in g_dbus_object_manager_client_finalize
X-Git-Tag: 2.41.2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=f62c8fce8e7f9ae102de308941423006e419cdf3;p=platform%2Fupstream%2Fglib.git

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
---

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);