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

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

Merge "Fix an OOB bug in check_eir_appearance" into udc-dev am: 4f63697e 

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



Change-Id: Ic81db7be7a8711a8082c9a93a5aeaab744652f60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 299abbde 4f63697e

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static bool check_eir_appearance(tBTA_DM_SEARCH* p_search_data, 
        p_search_data->inq_res.p_eir, p_search_data->inq_res.eir_len,

        HCI_EIR_APPEARANCE_TYPE, &appearance_len);



    if (p_eir_appearance) {

    if (p_eir_appearance && appearance_len >= 2) {

      if (p_appearance) {

        *p_appearance = *((uint16_t*)p_eir_appearance);

      }