Преглед изворни кода

Merge branch 'bugfix/fix_some_bt_controller_bug' into 'master'

component_bt:Fixed some bluetooth bugs

Closes AUD-3566 and ESPCS-871

See merge request espressif/esp-idf!19247
Wang Meng Yang пре 2 година
родитељ
комит
fe04d6dad9

+ 1 - 1
components/bt/controller/lib_esp32

@@ -1 +1 @@
-Subproject commit 012c5f188d3b7a6f96a6b9656980c126919ffa8c
+Subproject commit e1b3a29c58a452a6c017113686262094afd87042

+ 5 - 3
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;
 }