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

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

Merge changes I7fcb7c46,Ia39886c4 into tm-dev am: 70614401 

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



Change-Id: I0d9c5f40f41a72da2cda304f2ffe833b0eebadfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd546f8c 70614401

system/main/shim/utils.cc

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ void parse_gap_data(const std::vector<uint8_t> &raw_data, 
      hci::GapData gap_data;

      uint8_t len = raw_data[offset];



      if (offset + len + 1 > raw_data.size()) {

        break;

      }



      auto begin = raw_data.begin() + offset;

      auto end = begin + len + 1;  // 1 byte for len

      auto data_copy = std::make_shared<std::vector<uint8_t>>(begin, end);