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

Commit 1df63f8d authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix a potential null pointer dereference in... 

Merge "Fix a potential null pointer dereference in btif_hf_client_upstreams_evt." into main am: 5d9b89e7

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



Change-Id: I7b8326f5a0c8dedfee7897dd5f94470fe073865a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81822e09 5d9b89e7

system/btif/src/btif_hf_client.cc

+4 −0
Original line number Diff line number Diff line
@@ -867,6 +867,10 @@ static void process_ind_evt(tBTA_HF_CLIENT_IND* ind) { 
static void btif_hf_client_upstreams_evt(uint16_t event, char* p_param) {

  tBTA_HF_CLIENT* p_data = (tBTA_HF_CLIENT*)p_param;



  if (p_data == nullptr) {

    log::error("event={} ({})'s param is null", dump_hf_client_event(event), event);

    return;

  }

  btif_hf_client_cb_t* cb = btif_hf_client_get_cb_by_bda(p_data->bd_addr);

  if (cb == NULL && event == BTA_HF_CLIENT_OPEN_EVT) {

    log::verbose("event BTA_HF_CLIENT_OPEN_EVT allocating block");