[dleyna-connector-dbus/f21] Fix crash when spawned by a call to com.intel.dLeynaRenderer.Manager.Release

[Debarshi Ray]

commit af96cf617091c6978ec9c5f773f6ed07d6f785eb
Author: Debarshi Ray <debarshir at freedesktop.org>
Date:   Tue Jan 20 16:44:00 2015 +0100

    Fix crash when spawned by a call to com.intel.dLeynaRenderer.Manager.Release
    
      (RH #1154788)

 ...on-t-crash-when-trying-to-unwatch-non-exi.patch |   87 ++++++++++++++++++++
 dleyna-connector-dbus.spec                         |    8 ++-
 2 files changed, 94 insertions(+), 1 deletions(-)
---
diff --git a/0001-Connector-Don-t-crash-when-trying-to-unwatch-non-exi.patch b/0001-Connector-Don-t-crash-when-trying-to-unwatch-non-exi.patch
new file mode 100644
index 0000000..db22c7e
--- /dev/null
+++ b/0001-Connector-Don-t-crash-when-trying-to-unwatch-non-exi.patch
@@ -0,0 +1,87 @@
+From c06ce2520886d42e3489c6a4abf5735e6bb080b9 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at freedesktop.org>
+Date: Mon, 19 Jan 2015 19:24:05 +0100
+Subject: [PATCH] [Connector] Don't crash when trying to unwatch non-existent
+ client
+
+$ gdbus call \
+    --session \
+    --dest com.intel.dleyna-renderer \
+    --object-path /com/intel/dLeynaRenderer \
+    --method com.intel.dLeynaRenderer.Manager.Release
+
+If a service is spawned as a result of the above command, then it will
+lead to a crash with this backtrace:
+
+    (client_name=0x7f7c94009750 ":1.603") at src/connector-dbus.c:271
+    (conn=<optimized out>, sender=0x7f7c94009750 ":1.603",
+    object=<optimized out>, interface=<optimized out>,
+    method=<optimized out>, parameters=<optimized out>,
+    invocation=0x2360e00) at server.c:780
+    at gdbusconnection.c:4884
+    at gmain.c:3111
+    (context=context at entry=0x2342ea0) at gmain.c:3710
+    block=block at entry=1, dispatch=dispatch at entry=1,
+    self=<optimized out>) at gmain.c:3781
+    at gmain.c:3975
+    (server=<optimized out>, control_point=<optimized out>,
+    user_data=0x0) at libdleyna/core/main-loop.c:155
+    argv=<optimized out>) at daemon.c:93
+
+This is because g_hash_table_lookup returns NULL which we try to
+dereference to get the client_id.
+
+Instead of our hand-spun solution for storing unsigned integers in a
+GHashTable, let's use standard GLib mechanisms for doing that. We
+avoid this problem and reduce a g_new/g_free pair as a bonus.
+---
+ src/connector-dbus.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/connector-dbus.c b/src/connector-dbus.c
+index 0e16239..83774c0 100644
+--- a/src/connector-dbus.c
++++ b/src/connector-dbus.c
+@@ -173,7 +173,7 @@ static gboolean prv_connector_initialize(const gchar *server_info,
+ 	g_context.objects = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+ 						  g_free, prv_free_dbus_object);
+ 	g_context.clients = g_hash_table_new_full(g_str_hash, g_str_equal,
+-						  g_free, g_free);
++						  g_free, NULL);
+ 
+ 	g_context.root_node_info = g_dbus_node_info_new_for_xml(root_info,
+ 								NULL);
+@@ -268,8 +268,8 @@ static void prv_connector_unwatch_client(const gchar *client_name)
+ 
+ 	DLEYNA_LOG_DEBUG("Enter");
+ 
+-	client_id = *(guint *)g_hash_table_lookup(g_context.clients,
+-						  client_name);
++	client_id = GPOINTER_TO_UINT(g_hash_table_lookup(g_context.clients,
++							 client_name));
+ 	(void) g_hash_table_remove(g_context.clients, client_name);
+ 
+ 	g_bus_unwatch_name(client_id);
+@@ -287,7 +287,6 @@ static void prv_lost_client(GDBusConnection *connection, const gchar *name,
+ static gboolean prv_connector_watch_client(const gchar *client_name)
+ {
+ 	guint watch_id;
+-	guint *client_id;
+ 	gboolean added = TRUE;
+ 
+ 	DLEYNA_LOG_DEBUG("Enter");
+@@ -301,10 +300,8 @@ static gboolean prv_connector_watch_client(const gchar *client_name)
+ 				      G_BUS_NAME_WATCHER_FLAGS_NONE,
+ 				      NULL, prv_lost_client, NULL,
+ 				      NULL);
+-	client_id = g_new(guint, 1);
+-	*client_id = watch_id;
+ 	g_hash_table_insert(g_context.clients, g_strdup(client_name),
+-			    client_id);
++			    GUINT_TO_POINTER(watch_id));
+ 
+ out:
+ 	DLEYNA_LOG_DEBUG("Exit");
+-- 
+2.1.0
+
diff --git a/dleyna-connector-dbus.spec b/dleyna-connector-dbus.spec
index 0dc5e39..b94243d 100644
--- a/dleyna-connector-dbus.spec
+++ b/dleyna-connector-dbus.spec
@@ -3,12 +3,13 @@
 
 Name:           dleyna-connector-dbus
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        D-Bus connector for dLeyna services
 
 License:        LGPLv2
 URL:            https://01.org/dleyna/
 Source0:        https://01.org/dleyna/sites/default/files/downloads/%{name}-%{version}.tar.gz
+Patch0:         0001-Connector-Don-t-crash-when-trying-to-unwatch-non-exi.patch
 
 BuildRequires:  dbus-devel
 BuildRequires:  dleyna-core-devel
@@ -29,6 +30,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -59,6 +61,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Tue Jan 20 2015 Debarshi Ray <rishi at fedoraproject.org> - 0.2.0-4
+- Fix crash when spawned by a call to com.intel.dLeynaRenderer.Manager.Release
+  (RH #1154788)
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild