aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-11 18:46:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-02-11 18:46:06 +0000
commit51a1098444c9eca7a4e94fa534e3aedbbad9bbe0 (patch)
treee67734b273dae073c2ff295917e932dfd5abc7e6
parent19d1ad5818c3227207b0d3a9b5cc9c42496c7f0f (diff)
parentb0b524f43c52f60cca62207a37d10945ac0450e2 (diff)
Merge "Check after shutdown for null security device list"
-rw-r--r--system/stack/btm/btm_ble_addr.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc
index 44436b9f3e..5d285e4932 100644
--- a/system/stack/btm/btm_ble_addr.cc
+++ b/system/stack/btm/btm_ble_addr.cc
@@ -195,6 +195,8 @@ tBTM_SEC_DEV_REC* btm_ble_resolve_random_addr(const RawAddress& random_bda) {
/** Find the security record whose LE identity address is matching */
static tBTM_SEC_DEV_REC* btm_find_dev_by_identity_addr(
const RawAddress& bd_addr, uint8_t addr_type) {
+ if (btm_cb.sec_dev_rec == nullptr) return nullptr;
+
list_node_t* end = list_end(btm_cb.sec_dev_rec);
for (list_node_t* node = list_begin(btm_cb.sec_dev_rec); node != end;
node = list_next(node)) {