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

Commit df8c3c21 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Fix an OOB bug in btm_ble_update_inq_result am: f92283ee 

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



Change-Id: I146067ea3d5f1403a4c9b930f5ad0aee8f44db0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b564905 f92283ee

system/stack/btm/btm_ble_gap.cc

+3 −0
Original line number Diff line number Diff line
@@ -2439,6 +2439,9 @@ void btm_ble_update_inq_result(tINQ_DB_ENT* p_i, uint8_t addr_type, 
                BTM_BLE_AD_TYPE_SERVICE_DATA_TYPE, &service_data_len))) {

      uint16_t uuid;

      const uint8_t* p_uuid = p_service_data;

      if (service_data_len < 2) {

        continue;

      }

      STREAM_TO_UINT16(uuid, p_uuid);



      if (uuid == 0x184E /* Audio Stream Control service */ ||