OSDN -- Develop and Download Open Source Software

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

system-bt: Commit

system/bt


Commit MetaInfo

Revision605ebb3369b3f961196815065a9fe4ba5bc4d659 (tree)
Time2018-05-26 03:41:55
AuthorHansong Zhang <hsz@goog...>
Commiterandroid-build-team Robot

Log Message

DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f
(cherry picked from commit e8d311224277e9db5dc94cb94929125992f546f3)

Change Summary

Incremental Difference

--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -235,6 +235,10 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) {
235235 bt_uuid_t* p_uuid = (bt_uuid_t*)prop->val + i;
236236 memset(buf, 0, sizeof(buf));
237237 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+ }
238242 strcat(value, buf);
239243 // strcat(value, ";");
240244 strcat(value, " ");
Show on old repository browser