patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: testlib: att_read: Fix assert on zero-sized read

Browse source 
`read_data` can be NULL even on success if `read_size` is `0`.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
This commit is contained in:
Aleksander Wasaznik 2023-11-30 12:27:06 +01:00 committed by Fabio Baltieri
parent a29473c38e
commit bbdcf4be7a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/bluetooth/common/testlib/src/att_read.c
View file

@ -39,13 +39,6 @@ static uint8_t att_read_cb(struct bt_conn *conn, uint8_t att_err,
k_mutex_lock(&ctx->lock, K_FOREVER);
if (read_data == NULL) {
__ASSERT_NO_MSG(ctx->long_read);
k_condvar_signal(&ctx->done);
k_mutex_unlock(&ctx->lock);
return BT_GATT_ITER_STOP;
}
ctx->att_err = att_err;
if (!att_err && ctx->result_handle) {
@ -60,7 +53,7 @@ static uint8_t att_read_cb(struct bt_conn *conn, uint8_t att_err,
}
}
if (!att_err && ctx->result_data) {
if (read_data && ctx->result_data) {
uint16_t result_data_size =
MIN(read_len, net_buf_simple_tailroom(ctx->result_data));
@ -71,7 +64,7 @@ static uint8_t att_read_cb(struct bt_conn *conn, uint8_t att_err,
*ctx->att_mtu = params->_att_mtu;
}
if (ctx->long_read) {
if (ctx->long_read && read_data) {
/* Don't signal `&ctx->done` */
k_mutex_unlock(&ctx->lock);
return BT_GATT_ITER_CONTINUE;