Bug 949843 - Don't use char* str = NS_ConvertUTF16toUTF8(aBdAddress).get();, r=echou

dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp

@@ -246,7 +246,8 @@ void
 StringToBdAddressType(const nsAString& aBdAddress,
                       bt_bdaddr_t *aRetBdAddressType)
 {
-  const char* str = NS_ConvertUTF16toUTF8(aBdAddress).get();
+  NS_ConvertUTF16toUTF8 bdAddressUTF8(aBdAddress);
+  const char* str = bdAddressUTF8.get();
 
   for (int i = 0; i < 6; i++) {
     aRetBdAddressType->address[i] = (uint8_t) strtoul(str, (char **)&str, 16);
@@ -982,7 +983,7 @@ BluetoothServiceBluedroid::SetProperty(BluetoothObjectType aType,
   const nsString propName = aValue.name();
   bt_property_t prop;
   bt_scan_mode_t scanMode;
-  nsString str;
+  nsCString str;
 
   // For Bluedroid, it's necessary to check property name for SetProperty
   if (propName.EqualsLiteral("Name")) {
@@ -1000,8 +1001,8 @@ BluetoothServiceBluedroid::SetProperty(BluetoothObjectType aType,
     prop.val = (void*)aValue.value().get_uint32_t();
   } else if (aValue.value().type() == BluetoothValue::TnsString) {
     // Set name
-    str = aValue.value().get_nsString();
-    const char* name = NS_ConvertUTF16toUTF8(str).get();
+    str = NS_ConvertUTF16toUTF8(aValue.value().get_nsString());
+    const char* name = str.get();
     prop.val = (void*)name;
     prop.len = strlen(name);
   } else if (aValue.value().type() == BluetoothValue::Tbool) {