From dbe296466fa911e0122194870eb5c7cd89edd5ee Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 16 Jan 2007 11:11:34 +0000
Subject: Fix GetConnectionName crash

---
 hcid/dbus-service.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c
index 4f935ff5..e060938e 100644
--- a/hcid/dbus-service.c
+++ b/hcid/dbus-service.c
@@ -252,13 +252,17 @@ static DBusHandlerResult get_connection_name(DBusConnection *conn,
 {
 	struct service *service = data;
 	DBusMessage *reply;
+	const char *bus_name;
 
 	reply = dbus_message_new_method_return(msg);
 	if (!reply)
 		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
+	if (service->bus_name)
+		bus_name = service->bus_name;
+
 	dbus_message_append_args(reply,
-			DBUS_TYPE_STRING, &service->bus_name,
+			DBUS_TYPE_STRING, &bus_name,
 			DBUS_TYPE_INVALID);
 
 	return send_message_and_unref(conn, reply);
-- 
cgit