Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c69c88 authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

bta_dm: Stop copying garbage am: 697db845

am: 82dc2811

Change-Id: I1ca5479b2a8355091a8fbf9771ac9133ab1f53ba
parents d77a1ad2 82dc2811
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -3062,11 +3062,19 @@ void bta_dm_acl_change(tBTA_DM_MSG* p_data) {
      conn.link_down.is_removed =
          bta_dm_cb.device_list.peer_device[i].remove_dev_pending;

      for (; i < bta_dm_cb.device_list.count; i++) {
      // Iterate to the one before the last when shrinking the list,
      // otherwise we memcpy garbage data into the record.
      // Then clear out the last item in the list since we are shrinking.
      for (; i < bta_dm_cb.device_list.count - 1; i++) {
        memcpy(&bta_dm_cb.device_list.peer_device[i],
               &bta_dm_cb.device_list.peer_device[i + 1],
               sizeof(bta_dm_cb.device_list.peer_device[i]));
      }
      if (bta_dm_cb.device_list.count > 0) {
        int clear_index = bta_dm_cb.device_list.count - 1;
        memset(&bta_dm_cb.device_list.peer_device[clear_index], 0,
               sizeof(bta_dm_cb.device_list.peer_device[clear_index]));
      }
      break;
    }
    if (bta_dm_cb.device_list.count) bta_dm_cb.device_list.count--;