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

Commit a2dbf90d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "advertise_data_parser: fix a potential OOB"

parents 71ea401c 226d1670

system/stack/include/advertise_data_parser.h

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ class AdvertiseDataParser { 
    auto data_start = ad.begin() + position;



    // Traxxas - bad name length

    if (std::equal(data_start, data_start + 3, trx_quirk.begin()) &&

    if ((ad.size() - position) >= 18 &&

        std::equal(data_start, data_start + 3, trx_quirk.begin()) &&

        std::equal(data_start + 5, data_start + 11, trx_quirk.begin() + 5) &&

        std::equal(data_start + 12, data_start + 18, trx_quirk.begin() + 12)) {

      return true;