feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_esp_hid_auth_fail_crash' into 'master'

Browse Source 
Fix esp hid crash when auth failed

Closes IDFGH-7417

See merge request espressif/esp-idf!19454
This commit is contained in:
Chen Jian Hua
2022-10-11 10:57:26 +08:00
parent 5f6f4ef3ac 453ecbe9f2
commit 88b71f6416
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_hid/src/ble_hidh.c
View File

@@ -104,6 +104,8 @@ static void read_device_services(esp_gatt_if_t gattc_if, esp_hidh_dev_t *dev)
ESP_LOGE(TAG, "malloc report maps failed"); ESP_LOGE(TAG, "malloc report maps failed");
return; return;
} }
/* read characteristic value may failed, so we should init report maps */
memset(dev->config.report_maps, 0, dev->config.report_maps_len * sizeof(esp_hid_raw_report_map_t));
for (uint16_t s = 0; s < dcount; s++) { for (uint16_t s = 0; s < dcount; s++) {
suuid = service_result[s].uuid.uuid.uuid16; suuid = service_result[s].uuid.uuid.uuid16;

5
components/esp_hid/src/esp_hidh.c
View File

@@ -657,7 +657,10 @@ static void esp_hidh_dev_resources_free(esp_hidh_dev_t *dev)
free((void *)dev->config.manufacturer_name); free((void *)dev->config.manufacturer_name);
free((void *)dev->config.serial_number); free((void *)dev->config.serial_number);
for (uint8_t d = 0; d < dev->config.report_maps_len; d++) { for (uint8_t d = 0; d < dev->config.report_maps_len; d++) {
free((void *)dev->config.report_maps[d].data); /* data of report map maybe is NULL */
if (dev->config.report_maps[d].data) {
free((void *)dev->config.report_maps[d].data);
}
} }
free((void *)dev->config.report_maps); free((void *)dev->config.report_maps);
esp_hidh_dev_report_t *r; esp_hidh_dev_report_t *r;