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

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

Merge "Fix a potential OOB in... 

Merge "Fix a potential OOB in BleAdvertiserVscHciInterfaceImpl::VendorSpecificEventCback" into tm-dev am: c2166e96 am: d9c7e9ac

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



Change-Id: Ief6055255b93583250a4352716b7a9703397dab8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8634bac1 d9c7e9ac

system/stack/btm/ble_advertiser_hci_interface.cc

+5 −1
Original line number Diff line number Diff line
@@ -292,10 +292,14 @@ class BleAdvertiserVscHciInterfaceImpl : public BleAdvertiserHciInterface { 
    uint8_t sub_event, adv_inst, change_reason;

    uint16_t conn_handle;



    if (length < 1) {

      return;

    }



    STREAM_TO_UINT8(sub_event, p);

    length--;



    if (sub_event != HCI_VSE_SUBCODE_BLE_MULTI_ADV_ST_CHG || length != 4) {

    if (sub_event != HCI_VSE_SUBCODE_BLE_MULTI_ADV_ST_CHG || length < 4) {

      return;

    }