From 3fd18692a2fa4d6ab8e84d180ef4310fb2647a49 Mon Sep 17 00:00:00 2001 From: xiongweichao Date: Thu, 13 Oct 2022 20:05:04 +0800 Subject: [PATCH 1/2] components/bt: Fix crash due to NULL point --- components/bt/host/bluedroid/bta/av/bta_av_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/bt/host/bluedroid/bta/av/bta_av_main.c b/components/bt/host/bluedroid/bta/av/bta_av_main.c index 48b6a5f694..7318d841f6 100644 --- a/components/bt/host/bluedroid/bta/av/bta_av_main.c +++ b/components/bt/host/bluedroid/bta/av/bta_av_main.c @@ -1251,9 +1251,11 @@ BOOLEAN bta_av_hdl_event(BT_HDR *p_msg) } else { APPL_TRACE_VERBOSE("handle=0x%x\n", p_msg->layer_specific); tBTA_AV_SCB *p_scb = bta_av_hndl_to_scb(p_msg->layer_specific); - p_scb->disc_rsn = p_msg->offset; - /* stream state machine events */ - bta_av_ssm_execute(p_scb, p_msg->event, (tBTA_AV_DATA *) p_msg); + if (p_scb) { + p_scb->disc_rsn = p_msg->offset; + /* stream state machine events */ + bta_av_ssm_execute(p_scb, p_msg->event, (tBTA_AV_DATA *) p_msg); + } } return TRUE; } From 2fa475bc2c311f9e1bd4900e8e228dc462b241f8 Mon Sep 17 00:00:00 2001 From: xiongweichao Date: Tue, 26 Jul 2022 14:33:25 +0800 Subject: [PATCH 2/2] bt: Fixed some bluetooth bugs 1. Fixed LC_AFH_UPDATE_IND has not benn processed causing memory exhaustion 2. Fixed no free elt in prog push 3. Fixed disconnect due to sniff with error Dsniff 4. Fixed the problem that the host continued to send ACL data to the controller after disconnection, which caused the connection to fail again --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 012c5f188d..e1b3a29c58 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 012c5f188d3b7a6f96a6b9656980c126919ffa8c +Subproject commit e1b3a29c58a452a6c017113686262094afd87042