system/bt
Revision | 605ebb3369b3f961196815065a9fe4ba5bc4d659 (tree) |
---|---|
Time | 2018-05-26 03:41:55 |
Author | Hansong Zhang <hsz@goog...> |
Commiter | android-build-team Robot |
DO NOT MERGE Prevent stack overflow in btif_storage
Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f
(cherry picked from commit e8d311224277e9db5dc94cb94929125992f546f3)
@@ -235,6 +235,10 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) { | ||
235 | 235 | bt_uuid_t* p_uuid = (bt_uuid_t*)prop->val + i; |
236 | 236 | memset(buf, 0, sizeof(buf)); |
237 | 237 | uuid_to_string_legacy(p_uuid, buf, sizeof(buf)); |
238 | + if (strlen(value) + strlen(buf) + 1 > (int) sizeof(value) - 1) { | |
239 | + android_errorWriteLog(0x534e4554, "73963551"); | |
240 | + return false; | |
241 | + } | |
238 | 242 | strcat(value, buf); |
239 | 243 | // strcat(value, ";"); |
240 | 244 | strcat(value, " "); |