commit 3c788dc0822c34e01835b3588a5dbd5b585f728a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 17 20:04:32 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jan 17 20:04:32 2024 +0000
tree d222c93f1becc6148a98a66474feff7c0979d504
parent f9d1477ee0a956b2d797d5b96e3f539c3d4394c7
parent f483697144f442174787e942ace5c48a83266c84

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25595184', 'googleplex-android-review.googlesource.com/25677276'] into 24Q1-release.

Change-Id: I031bac0d0045537ede0c4ab2583496e2e12a1c4f

system/stack/gatt/att_protocol.cc

diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc
index 25d6687..be04498 100644
--- a/system/stack/gatt/att_protocol.cc
+++ b/system/stack/gatt/att_protocol.cc
@@ -290,12 +290,13 @@
   size_t pair_len;
   size_t size_now = 1;
 
-  #define CHECK_SIZE() do {                      \
-    if (size_now > payload_size) {               \
-      LOG(ERROR) << "payload size too small";    \
-      osi_free(p_buf);                           \
-      return nullptr;                            \
-    }                                            \
+#define CHECK_SIZE()                       \
+  do {                                     \
+    if (size_now > payload_size) {         \
+      LOG_ERROR("payload size too small"); \
+      osi_free(p_buf);                     \
+      return nullptr;                      \
+    }                                      \
   } while (false)
 
   BT_HDR* p_buf =
@@ -308,7 +309,7 @@
   p_buf->offset = L2CAP_MIN_OFFSET;
 
   if (op_code == GATT_RSP_READ_BY_TYPE) {
-    p_pair_len = p;
+    p_pair_len = p++;
     pair_len = len + 2;
     size_now += 1;
     CHECK_SIZE();
@@ -327,7 +328,7 @@
     UINT16_TO_STREAM(p, offset);
   }
 
-  if (len > 0 && p_data != NULL && payload_size > size_now) {
+  if (len > 0 && p_data != NULL) {
     /* ensure data not exceed MTU size */
     if (payload_size - size_now < len) {
       len = payload_size - size_now;
@@ -348,17 +349,17 @@
   // backfill pair len field
   if (op_code == GATT_RSP_READ_BY_TYPE) {
     if (pair_len > UINT8_MAX) {
-      LOG(ERROR) << "pair_len greater than" << UINT8_MAX;
+      LOG_ERROR("pair_len greater than %d", UINT8_MAX);
       osi_free(p_buf);
       return nullptr;
     }
 
-    *p_pair_len = (uint8_t) pair_len;
+    *p_pair_len = (uint8_t)pair_len;
   }
 
-  #undef CHECK_SIZE
+#undef CHECK_SIZE
 
-  p_buf->len = (uint16_t) size_now;
+  p_buf->len = (uint16_t)size_now;
   return p_buf;
 }