[meego-commits] 8779: Changes to Trunk:Testing/bluez

[Zhu Yanhai]

Hi,
I have made the following changes to bluez in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Zhu Yanhai

[This message was auto-generated]

---

Request #8779:

  submit:   home:zhuyanhai:branches:Trunk:Testing/bluez(r2)(cleanup) -> Trunk:Testing/bluez


Message:
    add Fix-crash-in-Manager.GetProperties.patch to fix BMC#7772.

State:   new          2010-10-24T19:50:02 zhuyanhai
Comment: None



changes files:
--------------
--- bluez.changes
+++ bluez.changes
@@ -0,0 +1,3 @@
+* Mon Oct 25 2010 Zhu Yanhai <yanhai.zhu at linux.intel.com> 4.76
+- Add Fix-crash-in-Manager.GetProperties.patch to fix BMC#7772.
+

new:
----
  Fix-crash-in-Manager.GetProperties.patch

spec files:
-----------
--- bluez.spec
+++ bluez.spec
@@ -21,6 +21,7 @@
 Patch3:     powered.patch
 Patch4:     install-test-scripts.patch
 Patch5:     install-more-binary-test.patch
+Patch6:     Fix-crash-in-Manager.GetProperties.patch
 Requires:   bluez-libs = %{version}
 Requires:   dbus >= 0.60
 Requires:   hwdata >= 0.215
@@ -132,6 +133,8 @@
 %patch4 -p1
 # install-more-binary-test.patch
 %patch5 -p1
+# Fix-crash-in-Manager.GetProperties.patch
+%patch6 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ Fix-crash-in-Manager.GetProperties.patch (new)
--- Fix-crash-in-Manager.GetProperties.patch
+++ Fix-crash-in-Manager.GetProperties.patch
+From c17e321e42999713298a357e83071e1f8c3d1b34 Mon Sep 17 00:00:00 2001
+From: Tommi Keisala <ext-tommi.keisala at nokia.com>
+Date: Sat, 23 Oct 2010 08:33:18 +0300
+Subject: [PATCH] Fix crash in Manager.GetProperties
+
+This patch avoids a crash when org.bluez.Manager GetProperties request
+is received and there are not yet any adapters ready. Happens often for
+example when bluetoothd and ofonod are started next to each other.
+---
+ src/manager.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/manager.c b/src/manager.c
+index aff069c..dd9560f 100644
+--- a/src/manager.c
++++ b/src/manager.c
+@@ -197,13 +197,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
+ 			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ 
+ 	array = g_new0(char *, g_slist_length(adapters) + 1);
+-	for (i = 0, list = adapters; list; list = list->next, i++) {
++	for (i = 0, list = adapters; list; list = list->next) {
+ 		struct btd_adapter *adapter = list->data;
+ 
+ 		if (!adapter_is_ready(adapter))
+ 			continue;
+ 
+ 		array[i] = (char *) adapter_get_path(adapter);
++		i++;
+ 	}
+ 	dict_append_array(&dict, "Adapters", DBUS_TYPE_OBJECT_PATH, &array, i);
+ 	g_free(array);
+-- 
+1.6.2.2
+

++++++ bluez.yaml
--- bluez.yaml
+++ bluez.yaml
@@ -15,6 +15,7 @@
     - powered.patch
     - install-test-scripts.patch
     - install-more-binary-test.patch
+    - Fix-crash-in-Manager.GetProperties.patch
 Description: |
     Utilities for use in Bluetooth applications:
     	--ciptool