aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-13 12:55:19 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-13 12:55:19 +0000
commitf7d1c151e9fcbdee8899bb3dfdef3ff02904fb04 (patch)
tree8269c28bd85f30cc17767771215683359257d340
parent0a92e4678b4de6fa704c35113e130feda9e8752f (diff)
parentd30055c8d941e1bf053e1d6658aae19734809c8c (diff)
downloadbt-f7d1c151e9fcbdee8899bb3dfdef3ff02904fb04.tar.gz
Snap for 8076125 from d30055c8d941e1bf053e1d6658aae19734809c8c to mainline-tethering-releaseandroid-mainline-12.0.0_r95android-mainline-12.0.0_r82
Change-Id: I2f29b9cbec6ab92b7697bfcde78a4d172162839b
-rw-r--r--stack/gatt/gatt_cl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc
index 8c3567d7a..cb5c13877 100644
--- a/stack/gatt/gatt_cl.cc
+++ b/stack/gatt/gatt_cl.cc
@@ -745,7 +745,7 @@ void gatt_process_notification(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code,
rem_len -= 4;
// Make sure we don't read past the remaining data even if the length says
// we can Also need to watch comparing the int16_t with the uint16_t
- value.len = std::min(rem_len, (int16_t)value.len);
+ value.len = std::min((uint16_t)rem_len, value.len);
STREAM_TO_ARRAY(value.value, p, value.len);
// Accounting
rem_len -= value.len;