device-manager: not use uninitialized value

Change-Id: I9ae9ad085f08532d5a56c9d779ce6ba1e31578fa

diff --git a/src/device-manager.c b/src/device-manager.c
index efec5c8796fcfc89c060674f2fb701c2ab40f82a..e85c15b21b030cfd94084cc2835b0a114cee4b58 100644 (file)
--- a/src/device-manager.c
+++ b/src/device-manager.c
@@ -2413,7 +2413,7 @@ static DBusHandlerResult dbus_filter_device_detect_handler(DBusConnection *c, DB
 
         if (DBUS_TYPE_BOOLEAN == dbus_message_iter_get_arg_type(&variant_iter)) {
             dbus_bool_t value;
-            char *name;
+            char *name = NULL;
             dbus_message_iter_get_basic(&variant_iter, &value);
             if (pa_streq(property_name, "Connected")) {
                 pa_log_info("HFP Connection : %d", value);
@@ -2722,13 +2722,12 @@ static void handle_get_connected_device_list(DBusConnection *conn, DBusMessage *
     pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "(isiis)", &array_iter));
 
     PA_IDXSET_FOREACH(device, dm->device_list, device_idx) {
+        device_id = (dbus_int32_t)pa_tz_device_get_id(device);
         state = pa_tz_device_get_state(device);
         direction = pa_tz_device_get_direction(device);
         type = pa_tz_device_get_type(device);
         name = pa_tz_device_get_name(device);
         if (device_is_match_with_mask(device,  mask)) {
-            device_id = (dbus_int32_t)pa_tz_device_get_id(device);
-
             simple_device_dump(PA_LOG_INFO, "[MATCH]", device_id, type, name, direction, state);
             pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &device_iter));
             dbus_message_iter_append_basic(&device_iter, DBUS_TYPE_INT32, &device_id);