commit db7ae0ecc0c908178a9f0250e3c81b163f171e80
author Ted Wang <tedwang@google.com> Tue Nov 26 02:37:43 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 26 02:37:43 2019 +0000
tree 75504c626c1fe6e083b951d44ddeb19b64f71e92
parent 3a9fd92f405b0f9e3f226d1e9a550400eccfc7c7
parent 247c64ee940b88cb7c14c857cb8630b8f3f1a979

Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into qt-dev

service/low_energy_client.cc

diff --git a/service/low_energy_client.cc b/service/low_energy_client.cc
index cc127c3..cb8bcf1 100644
--- a/service/low_energy_client.cc
+++ b/service/low_energy_client.cc
@@ -188,8 +188,8 @@
 
   if (!bda) return;
 
-  const char* addr = BtAddrString(bda).c_str();
-  if (delegate_) delegate_->OnMtuChanged(this, status, addr, mtu);
+  std::string addr = BtAddrString(bda);
+  if (delegate_) delegate_->OnMtuChanged(this, status, addr.c_str(), mtu);
 }
 
 // LowEnergyClientFactory implementation

stack/btm/btm_acl.cc

diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index dcb2fb4..31d38e5 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -50,6 +50,7 @@
 #include "device/include/interop.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"
+#include "log/log.h"
 #include "l2c_int.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"