espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix ble read multi char err when the number of handles is more than 10

Browse Source
This commit is contained in:
zhiweijian
2021-02-22 14:51:33 +08:00
parent db72885f15
commit 928e004208
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/bt/bluedroid/bta/gatt/bta_gattc_act.c
View File

@ -1149,12 +1149,16 @@ void bta_gattc_read_multi(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
memset(&read_param, 0, sizeof(tGATT_READ_PARAM)); memset(&read_param, 0, sizeof(tGATT_READ_PARAM));
if (status == BTA_GATT_OK) { if (status == BTA_GATT_OK) {
read_param.read_multiple.num_handles = p_data->api_read_multi.num_attr; if(p_data->api_read_multi.num_attr < GATT_MAX_READ_MULTI_HANDLES) {
read_param.read_multiple.auth_req = p_data->api_read_multi.auth_req; read_param.read_multiple.num_handles = p_data->api_read_multi.num_attr;
memcpy(&read_param.read_multiple.handles, p_data->api_read_multi.handles, read_param.read_multiple.auth_req = p_data->api_read_multi.auth_req;
sizeof(UINT16) * p_data->api_read_multi.num_attr); memcpy(&read_param.read_multiple.handles, p_data->api_read_multi.handles,
sizeof(UINT16) * p_data->api_read_multi.num_attr);
status = GATTC_Read(p_clcb->bta_conn_id, GATT_READ_MULTIPLE, &read_param); status = GATTC_Read(p_clcb->bta_conn_id, GATT_READ_MULTIPLE, &read_param);
} else {
status = GATT_ILLEGAL_PARAMETER;
}
} }
/* read fail */ /* read fail */

1
components/bt/bluedroid/stack/gatt/gatt_sr.c
View File

@ -527,6 +527,7 @@ void gatt_process_read_multi_req (tGATT_TCB *p_tcb, UINT8 op_code, UINT16 len, U
if (ll != 0) { if (ll != 0) {
GATT_TRACE_ERROR("max attribute handle reached in ReadMultiple Request."); GATT_TRACE_ERROR("max attribute handle reached in ReadMultiple Request.");
err = GATT_INVALID_HANDLE;
} }
if (p_tcb->sr_cmd.multi_req.num_handles == 0) { if (p_tcb->sr_cmd.multi_req.num_handles == 0) {