From 865c1143b738a807e6c572fc760d837f7853ad53 Mon Sep 17 00:00:00 2001 From: Luo Xu Date: Mon, 6 Jul 2026 17:43:51 +0800 Subject: [PATCH] fix(ble_mesh): re-check scan dev-found cb before scan-rsp invocation (cherry picked from commit 9a3a767824a765335f68e1d400684c5c6973caaf) Co-authored-by: luoxu --- components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c index 11130222662..dbe2212b9b3 100644 --- a/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c +++ b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c @@ -640,7 +640,7 @@ static void bt_mesh_scan_result_callback(tBTA_DM_SEARCH_EVT event, tBTA_DM_SEARC if (bt_mesh_scan_dev_found_cb) { bt_mesh_scan_dev_found_cb(&adv_rpt); - if (p_data->inq_res.scan_rsp_len) { + if (p_data->inq_res.scan_rsp_len && bt_mesh_scan_dev_found_cb) { adv_rpt.adv_type = BLE_MESH_ADV_SCAN_RSP; net_buf_simple_init_with_data(&adv_rpt.adv_data, p_data->inq_res.p_eir + p_data->inq_res.adv_data_len, p_data->inq_res.scan_rsp_len); bt_mesh_scan_dev_found_cb(&adv_rpt);