From 6015dde7db3dec15916b37a783624d8d6cd4fe30 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Tue, 18 Mar 2025 12:54:34 +0800 Subject: [PATCH] fix(ble): fix ble log init failure mem leak for ESP32 (cherry picked from commit bb9dc5a92722c90000a48fb7922873ff0fafd0cf) Co-authored-by: Zhou Xiao --- components/bt/controller/esp32/bt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/esp32/bt.c b/components/bt/controller/esp32/bt.c index 6768dc1a63..2a5991be4c 100644 --- a/components/bt/controller/esp32/bt.c +++ b/components/bt/controller/esp32/bt.c @@ -1686,7 +1686,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) #endif #if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED - ble_log_spi_out_init(); + if (ble_log_spi_out_init() != 0) { + ESP_LOGE(BTDM_LOG_TAG, "BLE Log SPI output init failed"); + goto error; + } #endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED btdm_cfg_mask = btdm_config_mask_load(); @@ -1705,6 +1708,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) error: +#if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED + ble_log_spi_out_deinit(); +#endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED + bt_controller_deinit_internal(); return err;