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

Commit 962e7ec2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "btm_ble_gap: Check bound before accessing pointer"

parents 17ac7632 2e29a53c

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ uint8_t btm_ble_is_discoverable(const RawAddress& bda, 
  if (!adv_data.empty()) {

    const uint8_t* p_flag = AdvertiseDataParser::GetFieldByType(

        adv_data, BTM_BLE_AD_TYPE_FLAG, &data_len);

    if (p_flag != NULL) {

    if (p_flag != NULL && data_len != 0) {

      flag = *p_flag;



      if ((btm_cb.btm_inq_vars.inq_active & BTM_BLE_GENERAL_INQUIRY) &&
@@ -1659,7 +1659,7 @@ void btm_ble_update_inq_result(tINQ_DB_ENT* p_i, uint8_t addr_type, 
  if (!data.empty()) {

    const uint8_t* p_flag =

        AdvertiseDataParser::GetFieldByType(data, BTM_BLE_AD_TYPE_FLAG, &len);

    if (p_flag != NULL) p_cur->flag = *p_flag;

    if (p_flag != NULL && len != 0) p_cur->flag = *p_flag;

  }



  if (!data.empty()) {