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

Fix spp crash after calling esp_spp_deinit

Browse Source
This commit is contained in:
xiongweichao
2022-04-27 14:43:42 +08:00
parent 4c69f1f901
commit 5bbdbabd75
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,11 +582,6 @@ static void btc_spp_uninit(void)
osi_mutex_unlock(&spp_local_param.spp_slot_mutex); osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
} while(0); } while(0);
if (spp_local_param.tx_event_group) {
vEventGroupDelete(spp_local_param.tx_event_group);
spp_local_param.tx_event_group = NULL;
}
if (ret != ESP_SPP_SUCCESS) { if (ret != ESP_SPP_SUCCESS) {
esp_spp_cb_param_t param; esp_spp_cb_param_t param;
param.uninit.status = ret; param.uninit.status = ret;
@@ -1051,7 +1046,7 @@ void btc_spp_cb_handler(btc_msg_t *msg)
} }
break; break;
case BTA_JV_RFCOMM_WRITE_EVT: case BTA_JV_RFCOMM_WRITE_EVT:
osi_mutex_lock(&spp_local_param.spp_slot_mutex, OSI_MUTEX_MAX_TIMEOUT); osi_mutex_lock(&spp_local_param.spp_slot_mutex, OSI_MUTEX_MAX_TIMEOUT);
slot = spp_find_slot_by_handle(p_data->rfc_write.handle); slot = spp_find_slot_by_handle(p_data->rfc_write.handle);
if (!slot) { if (!slot) {
BTC_TRACE_ERROR("%s unable to find RFCOMM slot!, handle:%d", __func__, p_data->rfc_write.handle); BTC_TRACE_ERROR("%s unable to find RFCOMM slot!, handle:%d", __func__, p_data->rfc_write.handle);
@@ -1256,6 +1251,10 @@ void btc_spp_cb_handler(btc_msg_t *msg)
param.uninit.status = ESP_SPP_SUCCESS; param.uninit.status = ESP_SPP_SUCCESS;
BTA_JvFree(); BTA_JvFree();
osi_mutex_free(&spp_local_param.spp_slot_mutex); osi_mutex_free(&spp_local_param.spp_slot_mutex);
if (spp_local_param.tx_event_group) {
vEventGroupDelete(spp_local_param.tx_event_group);
spp_local_param.tx_event_group = NULL;
}
#if SPP_DYNAMIC_MEMORY == TRUE #if SPP_DYNAMIC_MEMORY == TRUE
osi_free(spp_local_param_ptr); osi_free(spp_local_param_ptr);
spp_local_param_ptr = NULL; spp_local_param_ptr = NULL;