From a961d7da47d89e50ef76c4b3765ff653e0c46fe0 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Wed, 24 Dec 2025 17:05:04 +0800 Subject: [PATCH] fix(ble): added null pointer check in ble log ts submodule (cherry picked from commit 2b9c7471d0f3841f36f8a4a01aae79b6d08e0cbd) Co-authored-by: Zhou Xiao --- components/bt/common/ble_log/src/ble_log_rt.c | 4 +++- components/bt/common/ble_log/src/ble_log_ts.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/components/bt/common/ble_log/src/ble_log_rt.c b/components/bt/common/ble_log/src/ble_log_rt.c index 0fb2dcc331..7268797e36 100644 --- a/components/bt/common/ble_log/src/ble_log_rt.c +++ b/components/bt/common/ble_log/src/ble_log_rt.c @@ -60,7 +60,9 @@ BLE_LOG_IRAM_ATTR BLE_LOG_STATIC void ble_log_rt_task(void *pvParameters) if (rt_ts_enabled) { ble_log_ts_info_t *ts_info = NULL; ble_log_ts_info_update(&ts_info); - ble_log_write_hex(BLE_LOG_SRC_INTERNAL, (const uint8_t *)ts_info, sizeof(ble_log_ts_info_t)); + if (ts_info) { + ble_log_write_hex(BLE_LOG_SRC_INTERNAL, (const uint8_t *)ts_info, sizeof(ble_log_ts_info_t)); + } } #endif /* CONFIG_BLE_LOG_TS_ENABLED */ diff --git a/components/bt/common/ble_log/src/ble_log_ts.c b/components/bt/common/ble_log/src/ble_log_ts.c index cd01d03dcb..e01611da10 100644 --- a/components/bt/common/ble_log/src/ble_log_ts.c +++ b/components/bt/common/ble_log/src/ble_log_ts.c @@ -63,6 +63,10 @@ void ble_log_ts_deinit(void) void ble_log_ts_info_update(ble_log_ts_info_t **info) { + if (!ts_inited) { + return; + } + BLE_LOG_ENTER_CRITICAL(); ts_info->io_level = !ts_info->io_level; gpio_set_level(CONFIG_BLE_LOG_SYNC_IO_NUM, ts_info->io_level); @@ -76,6 +80,10 @@ void ble_log_ts_info_update(ble_log_ts_info_t **info) void ble_log_ts_reset(bool status) { + if (!ts_inited) { + return; + } + if (!status && !ts_info->io_level) { gpio_set_level(CONFIG_BLE_LOG_SYNC_IO_NUM, 1); }