From: Hansong Zhang <hsz@google.com>
Date: Thu, 26 Apr 2018 22:50:53 +0000 (-0700)
Subject: DO NOT MERGE Prevent stack overflow in btif_storage
X-Git-Tag: android-x86-8.1-r1~4^2^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=605ebb3369b3f961196815065a9fe4ba5bc4d659;p=android-x86%2Fsystem-bt.git

DO NOT MERGE Prevent stack overflow in btif_storage

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

diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index 9d4a84ed0..1c34787b2 100644
--- 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) {
         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, " ");