[maemo-commits] [maemo-commits] r16250 - in projects/connectivity/bluez-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-09-29 00:06:53 +0300 (Mon, 29 Sep 2008)
New Revision: 16250

Added:
   projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch
Modified:
   projects/connectivity/bluez-debian/trunk/changelog
Log:
Prepare for 4.7-0maemo2

Modified: projects/connectivity/bluez-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-debian/trunk/changelog	2008-09-27 11:42:38 UTC (rev 16249)
+++ projects/connectivity/bluez-debian/trunk/changelog	2008-09-28 21:06:53 UTC (rev 16250)
@@ -1,3 +1,9 @@
+bluez (4.7-0maemo2) unstable; urgency=low
+
+  * Backport two bluetoothd crasher fixes (related to pairing) from git.
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Sun, 28 Sep 2008 21:00:31 +0000
+
 bluez (4.7-0maemo1) unstable; urgency=low
 
   * New upstream version

Added: projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch
===================================================================
--- projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch	2008-09-27 11:42:38 UTC (rev 16249)
+++ projects/connectivity/bluez-debian/trunk/patches/004_pairing_crash.patch	2008-09-28 21:06:53 UTC (rev 16250)
@@ -0,0 +1,30 @@
+--- src/dbus-hci.c	2008-09-26 05:39:55.000000000 +0000
++++ src/dbus-hci.c	2008-09-28 20:57:42.000000000 +0000
+@@ -518,7 +518,7 @@
+ 
+ 	bonding = adapter_get_bonding_info(adapter);
+ 
+-	if (bacmp(&bonding->bdaddr, peer))
++	if (bonding && bacmp(&bonding->bdaddr, peer))
+ 		bonding = NULL;
+ 
+ 	if (status == 0) {
+--- src/device.c	2008-09-26 05:39:55.000000000 +0000
++++ src/device.c	2008-09-28 20:56:59.000000000 +0000
+@@ -857,6 +857,7 @@
+ 
+ static void services_changed(struct browse_req *req)
+ {
++	DBusConnection *conn = get_dbus_connection();
+ 	struct btd_device *device = req->device;
+ 	char **uuids;
+ 	GSList *l;
+@@ -866,7 +867,7 @@
+ 	for (i = 0, l = device->uuids; l; l = l->next, i++)
+ 		uuids[i] = l->data;
+ 
+-	dbus_connection_emit_property_changed(req->conn, device->path,
++	dbus_connection_emit_property_changed(conn, device->path,
+ 					DEVICE_INTERFACE, "UUIDs",
+ 					DBUS_TYPE_ARRAY, &uuids);
+