commit 8567fb188b1a8b4de97b95f89d75991e648794a2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 11 10:01:59 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 11 10:01:59 2022 +0000
tree 8269c28bd85f30cc17767771215683359257d340
parent 518baf71c063188cae950d8379434c2b2c1453cb
parent d30055c8d941e1bf053e1d6658aae19734809c8c

Snap for 8066129 from d30055c8d941e1bf053e1d6658aae19734809c8c to mainline-permission-release

Change-Id: I644cab6cac8cd1b3b47f58288d2a416d8ba17e00

stack/gatt/gatt_cl.cc

diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc
index 8c3567d..cb5c138 100644
--- a/stack/gatt/gatt_cl.cc
+++ b/stack/gatt/gatt_cl.cc
@@ -745,7 +745,7 @@
     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;