commit 7edbf3ee040b7aa779ca814cfe0845efc309be30
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 17 23:49:38 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 17 23:49:38 2022 +0000
tree fa59b5091e74396ada0fb2d60a8bab6e29245604
parent 5e487c24ebe1e48365320c8445ef874572e7e1e3
parent a545b174a31bb322e5f0c34a6b1af9d1c0483aa8

Merge cherrypicks of [19610022, 19612360] into rvc-platform-release.

Change-Id: I500cbb785eb940beb8d4316045980059b5063c26

btif/src/bluetooth.cc

diff --git a/btif/src/bluetooth.cc b/btif/src/bluetooth.cc
index a00c0c6..e4e50b6 100644
--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -309,10 +309,12 @@
 
 static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
                      bt_pin_code_t* pin_code) {
+  bt_pin_code_t tmp_pin_code;
   /* sanity check */
   if (!interface_ready()) return BT_STATUS_NOT_READY;
 
-  return btif_dm_pin_reply(bd_addr, accept, pin_len, pin_code);
+  memcpy(&tmp_pin_code, pin_code, pin_len);
+  return btif_dm_pin_reply(bd_addr, accept, pin_len, &tmp_pin_code);
 }
 
 static int ssp_reply(const RawAddress* bd_addr, bt_ssp_variant_t variant,

stack/sdp/sdp_discovery.cc

diff --git a/stack/sdp/sdp_discovery.cc b/stack/sdp/sdp_discovery.cc
index bdc15bd..f5938e4 100644
--- a/stack/sdp/sdp_discovery.cc
+++ b/stack/sdp/sdp_discovery.cc
@@ -285,7 +285,7 @@
 
   orig = p_ccb->num_handles;
   p_ccb->num_handles += cur_handles;
-  if (p_ccb->num_handles == 0) {
+  if (p_ccb->num_handles == 0 || p_ccb->num_handles < orig) {
     SDP_TRACE_WARNING("SDP - Rcvd ServiceSearchRsp, no matches");
     sdp_disconnect(p_ccb, SDP_NO_RECS_MATCH);
     return;