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

Commit f7e96a7a authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Check for uniniatialized security database before accessing it" into main am: 1663e06f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3010933



Change-Id: I7476f100d1cff45eb3e862577c757287ff236d71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bd2055a 1663e06f

system/stack/btm/btm_dev.cc

+8 −6
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ bool btm_set_bond_type_dev(const RawAddress& bd_addr, 
std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec() {

  std::vector<tBTM_SEC_DEV_REC*> result{};



  if (btm_sec_cb.sec_dev_rec != nullptr) {

    list_node_t* end = list_end(btm_sec_cb.sec_dev_rec);

    for (list_node_t* node = list_begin(btm_sec_cb.sec_dev_rec); node != end;

         node = list_next(node)) {
@@ -711,6 +712,7 @@ std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec() { 
          static_cast<tBTM_SEC_DEV_REC*>(list_node(node));

      result.push_back(p_dev_rec);

    }

  }

  return result;

}