alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_dangling_pointer_in_remove_bond_list_section_v5.1' into 'release/v5.1'

Browse Source 
fix(bt/bluedroid): fix dangling pointer issue when logging removed section (backport v5.1)

See merge request espressif/esp-idf!28962
This commit is contained in:
Jiang Jiang Jian 2024-02-27 20:01:11 +08:00
commit f9db462a46
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/host/bluedroid/btc/core/btc_storage.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -57,7 +57,8 @@ bt_status_t btc_storage_add_bonded_device(bt_bdaddr_t *remote_bd_addr,
// delete config info // delete config info
if (btc_config_remove_section(remove_section)) { if (btc_config_remove_section(remove_section)) {
BTC_TRACE_WARNING("exceeded the maximum nubmer of bonded devices, delete the first device info : %s\n", remove_section); BTC_TRACE_WARNING("exceeded the maximum nubmer of bonded devices, delete the first device info : %02x:%02x:%02x:%02x:%02x:%02x",
bd_addr.address[0], bd_addr.address[1], bd_addr.address[2], bd_addr.address[3], bd_addr.address[4], bd_addr.address[5]);
} }
} }
@ -131,6 +132,7 @@ static bt_status_t btc_in_fetch_bonded_devices(int add)
bt_status_t status = BT_STATUS_FAIL; bt_status_t status = BT_STATUS_FAIL;
uint16_t dev_cnt = 0; uint16_t dev_cnt = 0;
const btc_config_section_iter_t *remove_iter = NULL; const btc_config_section_iter_t *remove_iter = NULL;
bt_bdaddr_t bd_addr;
btc_config_lock(); btc_config_lock();
for (const btc_config_section_iter_t *iter = btc_config_section_begin(); iter != btc_config_section_end(); iter = btc_config_section_next(iter)) { for (const btc_config_section_iter_t *iter = btc_config_section_begin(); iter != btc_config_section_end(); iter = btc_config_section_next(iter)) {
@ -157,6 +159,7 @@ static bt_status_t btc_in_fetch_bonded_devices(int add)
remove_iter = iter; remove_iter = iter;
while (remove_iter != btc_config_section_end()) { while (remove_iter != btc_config_section_end()) {
const char *remove_section = btc_config_section_name(remove_iter); const char *remove_section = btc_config_section_name(remove_iter);
string_to_bdaddr(remove_section, &bd_addr);
if (!string_is_bdaddr(remove_section)) { if (!string_is_bdaddr(remove_section)) {
remove_iter = btc_config_section_next(remove_iter); remove_iter = btc_config_section_next(remove_iter);
continue; continue;
@ -164,7 +167,8 @@ static bt_status_t btc_in_fetch_bonded_devices(int add)
remove_iter = btc_config_section_next(remove_iter); remove_iter = btc_config_section_next(remove_iter);
/* delete config info */ /* delete config info */
if (btc_config_remove_section(remove_section)) { if (btc_config_remove_section(remove_section)) {
BTC_TRACE_WARNING("exceeded the maximum number of bonded devices, delete the exceed device info : %s", remove_section); BTC_TRACE_WARNING("exceeded the maximum number of bonded devices, delete the exceed device info : %02x:%02x:%02x:%02x:%02x:%02x",
bd_addr.address[0], bd_addr.address[1], bd_addr.address[2], bd_addr.address[3], bd_addr.address[4], bd_addr.address[5]);
} }
} }
/* write into nvs */ /* write into nvs */