From ad0739b48ee6e40363e19b963ebb0a3de44db4c3 Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Tue, 24 Jul 2012 13:05:04 -0700
Subject: [PATCH] Bug 776745 - [b2g-bluetooth] Crash in bluetooth discovery due
 to initializer buried in NS_ASSERTION; r=anygregor

---
 dom/bluetooth/linux/BluetoothDBusService.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 9232cbcbdae..e3a29fb7ea2 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -403,8 +403,10 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData)
 
     DBusMessageIter iter;
 
-    NS_ASSERTION(dbus_message_iter_init(aMsg, &iter),
-                 "Can't create message iterator!");
+    if (!dbus_message_iter_init(aMsg, &iter)) {
+      NS_WARNING("Can't create iterator!");
+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
 
     InfallibleTArray<BluetoothNamedValue> value;
     const char* addr;