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

Commit ba4033b2 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into cw-f-dev 

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 89a18a04 am: d15ee07e am: faa4e38f
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 89a18a04 am: d15ee07e
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 89a18a04
  DO NOT MERGE Prevent stack overflow in btif_storage
parents c33a4669 a26872ef

system/btif/src/btif_storage.c

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ static int prop2cfg(bt_bdaddr_t *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);

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

                    android_errorWriteLog(0x534e4554, "73963551");

                    return FALSE;

                }

                strcat(value, buf);

                //strcat(value, ";");

                strcat(value, " ");