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

Commit 623f622f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent writing empty address to bt_conf" am: 21441235 

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

Change-Id: I6ab301942cbee5e77044c8194f9f5b9c9e8af992
parents 819b5ca3 21441235

system/btif/src/btif_dm.cc

+13 −3
Original line number Original line Diff line number Diff line
@@ -967,9 +967,14 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        bt_status_t ret;

        bt_status_t ret;

        BTIF_TRACE_DEBUG("%s: Storing link key. key_type=0x%x, bond_type=%d",

        BTIF_TRACE_DEBUG("%s: Storing link key. key_type=0x%x, bond_type=%d",

                         __func__, p_auth_cmpl->key_type, pairing_cb.bond_type);

                         __func__, p_auth_cmpl->key_type, pairing_cb.bond_type);

        if (!bd_addr.IsEmpty()) {

          ret = btif_storage_add_bonded_device(&bd_addr, p_auth_cmpl->key,

          ret = btif_storage_add_bonded_device(&bd_addr, p_auth_cmpl->key,

                                               p_auth_cmpl->key_type,

                                               p_auth_cmpl->key_type,

                                               pairing_cb.pin_code_len);

                                               pairing_cb.pin_code_len);

        } else {

          LOG_WARN("bd_addr is empty");

          ret = BT_STATUS_FAIL;

        }

        ASSERTC(ret == BT_STATUS_SUCCESS, "storing link key failed", ret);

        ASSERTC(ret == BT_STATUS_SUCCESS, "storing link key failed", ret);

      } else {

      } else {

        BTIF_TRACE_DEBUG(

        BTIF_TRACE_DEBUG(
@@ -2775,6 +2780,11 @@ void btif_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, 
static void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr) {

static void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr) {

  BTIF_TRACE_DEBUG("%s", __func__);

  BTIF_TRACE_DEBUG("%s", __func__);





  if (bd_addr.IsEmpty()) {

    LOG_WARN("bd_addr is empty");

    return;

  }



  if (pairing_cb.ble.is_penc_key_rcvd) {

  if (pairing_cb.ble.is_penc_key_rcvd) {

    btif_storage_add_ble_bonding_key(

    btif_storage_add_ble_bonding_key(

        &bd_addr, (uint8_t*)&pairing_cb.ble.penc_key, BTM_LE_KEY_PENC,

        &bd_addr, (uint8_t*)&pairing_cb.ble.penc_key, BTM_LE_KEY_PENC,