From: Jiang Jiang Jian <jack@espressif.com>
Date: Mon, 3 Jul 2017 11:41:46 +0000 (+0800)
Subject: Merge branch 'bugfix/bt_avdt_state_machine' into 'master'
X-Git-Tag: v2.1~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663129abceb4e40f1784ea611ec5309bbba37700;p=esp-idf

Merge branch 'bugfix/bt_avdt_state_machine' into 'master'

component/bt: bugfix for AVDTP state machine function on disconnection to handle NULL pointer condition

See merge request !946
---

diff --git a/components/bt/bluedroid/stack/avdt/avdt_scb_act.c b/components/bt/bluedroid/stack/avdt/avdt_scb_act.c
index ec270d2689..d645f32d14 100644
--- a/components/bt/bluedroid/stack/avdt/avdt_scb_act.c
+++ b/components/bt/bluedroid/stack/avdt/avdt_scb_act.c
@@ -956,7 +956,11 @@ void avdt_scb_hdl_tc_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
 
     /* set up hdr */
     avdt_ctrl.hdr.err_code = p_scb->close_code;
-    avdt_ctrl.hdr.err_param = p_data->close.disc_rsn;
+    if (p_data) {
+        avdt_ctrl.hdr.err_param = p_data->close.disc_rsn;
+    } else {
+        avdt_ctrl.hdr.err_param = AVDT_DISC_RSN_NORMAL;
+    }
 
     /* clear sep variables */
     avdt_scb_clr_vars(p_scb, p_data);