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

Commit 19bd750a authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into oc-dev am: 8c17e3f3 

am: 74000ff6

Change-Id: Ibaa5c02e34c2337458d27b76c6b60f8da47feab5
parents 8639b8ab 74000ff6

system/btif/src/btif_storage.cc

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) { 
        bt_uuid_t* p_uuid = (bt_uuid_t*)prop->val + i;

        memset(buf, 0, sizeof(buf));

        uuid_to_string_legacy(p_uuid, buf, sizeof(buf));

        if (strlen(value) + strlen(buf) + 1 > (int) sizeof(value) - 1) {

          android_errorWriteLog(0x534e4554, "73963551");

          return false;

        }

        strcat(value, buf);

        // strcat(value, ";");

        strcat(value, " ");