DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f

diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 83a5c2e..3879e26 100644 (file)
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -280,6 +280,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, " ");