mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/access_null_in_hf_cb' into 'master' 

fix(bt/bluedroid): fixed access NULL in HFP callback handler

Closes BTQABR2023-410 and BTQABR2023-411

See merge request espressif/esp-idf!35405
pull/14997/head
Wang Meng Yang 2024-12-05 15:44:01 +08:00
rodzic ab1d025abb 185b4d9d44
commit c8b9ea3b13
1 zmienionych plików z 33 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

50
components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c
Wyświetl plik

@ -316,12 +316,17 @@ bt_status_t btc_hf_init(void)
{
int idx = 0;
if (hf_local_param[idx].btc_hf_cb.initialized) {
esp_hf_cb_param_t param = {
.prof_stat.state = ESP_HF_INIT_ALREADY,
};
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
return BT_STATUS_SUCCESS;
#if HFP_DYNAMIC_MEMORY == TRUE
if (hf_local_param)
#endif
{
if (hf_local_param[idx].btc_hf_cb.initialized) {
esp_hf_cb_param_t param = {
.prof_stat.state = ESP_HF_INIT_ALREADY,
};
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
return BT_STATUS_SUCCESS;
}
}
BTC_TRACE_DEBUG("%s - max_hf_clients=%d", __func__, btc_max_hf_clients);
@ -364,12 +369,18 @@ void btc_hf_deinit(void)
BTC_TRACE_EVENT("%s", __FUNCTION__);
int idx = 0;
if (!hf_local_param[idx].btc_hf_cb.initialized) {
esp_hf_cb_param_t param = {
.prof_stat.state = ESP_HF_DEINIT_ALREADY,
};
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
return;
#if HFP_DYNAMIC_MEMORY == TRUE
if (hf_local_param)
#endif
{
if (!hf_local_param[idx].btc_hf_cb.initialized) {
esp_hf_cb_param_t param = {
.prof_stat.state = ESP_HF_DEINIT_ALREADY,
};
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
return;
}
}
btc_dm_disable_service(BTA_HFP_SERVICE_ID);
@ -1285,12 +1296,17 @@ void btc_hf_cb_handler(btc_msg_t *msg)
case BTA_AG_DISABLE_EVT:
{
idx = 0;
btc_hf_cb_release();
if (hf_local_param[idx].btc_hf_cb.initialized) {
param.prof_stat.state = ESP_HF_DEINIT_SUCCESS;
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
#if HFP_DYNAMIC_MEMORY == TRUE
if (hf_local_param)
#endif
{
if (hf_local_param[idx].btc_hf_cb.initialized) {
hf_local_param[idx].btc_hf_cb.initialized = false;
btc_hf_cb_release();
param.prof_stat.state = ESP_HF_DEINIT_SUCCESS;
btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
}
}
hf_local_param[idx].btc_hf_cb.initialized = false;
break;
}
case BTA_AG_REGISTER_EVT: