OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
502e076
)
DO NOT MERGE Prevent stack overflow in btif_storage
author
Hansong Zhang
<hsz@google.com>
Thu, 26 Apr 2018 22:50:53 +0000
(15:50 -0700)
committer
hamzeh
<hamzeh@google.com>
Wed, 16 May 2018 00:38:41 +0000
(17:38 -0700)
Bug:
73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f
(cherry picked from commit
e8d311224277e9db5dc94cb94929125992f546f3
)
btif/src/btif_storage.cc
patch
|
blob
|
history
diff --git
a/btif/src/btif_storage.cc
b/btif/src/btif_storage.cc
index
9d4a84e
..
1c34787
100644
(file)
--- 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, " ");