Merge branch 'bugfix/deadlock_after_call_esp_bluedroid_disable' into …

…'master' bt:Fixed deadlock due to wrong parameter when calling btc_transfer_context() after calling esp_bluedroid_disable() Closes IDFGH-8175 and BT-2744 See merge request espressif/esp-idf!19859
espressif · Sep 5, 2022 · 4eb98ad · 4eb98ad
2 parents f60e940 + 80e3d96
commit 4eb98ad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/components/bt/host/bluedroid/btc/core/btc_dm.c b/components/bt/host/bluedroid/btc/core/btc_dm.c
@@ -104,7 +104,8 @@ void btc_dm_sec_evt(tBTA_DM_SEC_EVT event, tBTA_DM_SEC *data)
     msg.pid = BTC_PID_DM_SEC;
     msg.act = event;
 
-    btc_transfer_context(&msg, (btc_dm_sec_args_t *)data, sizeof(btc_dm_sec_args_t), btc_dm_sec_arg_deep_copy);
+    btc_transfer_context(&msg, (btc_dm_sec_args_t *)data,
+                            data == NULL ? 0 : sizeof(btc_dm_sec_args_t), btc_dm_sec_arg_deep_copy);
 }
 
 static void btc_enable_bluetooth_evt(tBTA_STATUS status)