[nrf fromtree] tests: bluetooth: tester: Fix GATT read multiple

Pass only speficied number of handler to read_params for GATT read multiple. This is to avoid sending invalid (zeros) handles in ATT_READ_MULTIPLE_REQ. This was affecting GATT/CL/GAR/BI-18-C and GATT/CL/GAR/BI-19-C qualification test cases. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit 4f57614)
nrfconnect · Oct 24, 2023 · 2e2523e · 2e2523e
1 parent 7ac4181
commit 2e2523e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c
@@ -1651,11 +1651,11 @@ static uint8_t read_multiple(const void *cmd, uint16_t cmd_len,
  return BTP_STATUS_FAILED;
  }
 
- if (cp->handles_count > ARRAY_SIZE(handles)) {
+ if (cp->handles_count == 0 || cp->handles_count > ARRAY_SIZE(handles)) {
  return BTP_STATUS_FAILED;
  }
 
- for (i = 0; i < ARRAY_SIZE(handles); i++) {
+ for (i = 0; i < cp->handles_count; i++) {
  handles[i] = sys_le16_to_cpu(cp->handles[i]);
  }
 
@@ -1670,7 +1670,7 @@ static uint8_t read_multiple(const void *cmd, uint16_t cmd_len,
  }
 
  read_params.func = read_cb;
- read_params.handle_count = i;
+ read_params.handle_count = cp->handles_count;
  read_params.multiple.handles = handles; /* not used in read func */
  read_params.multiple.variable = false;
  read_params.chan_opt = BT_ATT_CHAN_OPT_NONE;