espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/spp_mem_leak_v5.3' into 'release/v5.3'

Browse Source 
fix(bt/bluedroid): fixed memory leaks in SPP callback mode (v5.3)

See merge request espressif/esp-idf!37386
This commit is contained in:
Wang Meng Yang
2025-04-15 07:51:10 +08:00
parent 5a011faf69 f58c729e8a
commit dd8d184f0a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c
View File

@@ -909,6 +909,9 @@ static void btc_spp_write(btc_spp_args_t *arg)
} else { } else {
if (fixed_queue_enqueue(slot->tx.queue, arg->write.p_data, 0)) { if (fixed_queue_enqueue(slot->tx.queue, arg->write.p_data, 0)) {
BTA_JvRfcommWrite(arg->write.handle, slot->id, arg->write.len, arg->write.p_data); BTA_JvRfcommWrite(arg->write.handle, slot->id, arg->write.len, arg->write.p_data);
// The TX queue of SPP will handle this memory properly.
// Set it to NULL here to prevent deep free handler from releasing it.
arg->write.p_data = NULL;
} else { } else {
ret = ESP_SPP_NO_RESOURCE; ret = ESP_SPP_NO_RESOURCE;
} }
@@ -966,6 +969,13 @@ void btc_spp_arg_deep_free(btc_msg_t *msg)
case BTC_SPP_ACT_START_DISCOVERY: case BTC_SPP_ACT_START_DISCOVERY:
if (arg->start_discovery.p_uuid_list) { if (arg->start_discovery.p_uuid_list) {
osi_free(arg->start_discovery.p_uuid_list); osi_free(arg->start_discovery.p_uuid_list);
arg->start_discovery.p_uuid_list = NULL;
}
break;
case BTC_SPP_ACT_WRITE:
if (arg->write.p_data) {
osi_free(arg->write.p_data);
arg->write.p_data = NULL;
} }
break; break;
default: default: