Re: [Bluez-devel] hcid patch (remote name and connections)

[Johan Hedberg <johan.hedberg@nokia.com>]

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

Hi,

I missed one place in the code where hci_dbus_data should be allocated
(thanks to Claudio for noticing). Here's a patch to fix it.

Johan

[-- Attachment #2: segfault.patch --]
[-- Type: text/plain, Size: 820 bytes --]

Index: hcid/dbus.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/dbus.c,v
retrieving revision 1.21
diff -u -r1.21 dbus.c
--- hcid/dbus.c	11 Oct 2005 22:45:38 -0000	1.21
+++ hcid/dbus.c	12 Oct 2005 19:13:14 -0000
@@ -774,7 +774,13 @@
 
 		syslog(LOG_INFO, "registering dft path:%s - id:%d", path, DEFAULT_DEVICE_PATH_ID);
 
-		if (!dbus_connection_register_object_path(conn, path, &obj_vtable, (void *) DEFAULT_DEVICE_PATH_ID)) { 
+		data = malloc(sizeof(struct hci_dbus_data));
+		if (data == NULL)
+			return -1;
+
+		data->id = DEFAULT_DEVICE_PATH_ID;
+
+		if (!dbus_connection_register_object_path(conn, path, &obj_vtable, data)) { 
 			syslog(LOG_ERR,"DBUS failed to register %s object", path);
 			/* ignore, the default path was already registered */
 		}