From 38ba5e030b2c2542e65a0414c6178241984ada22 Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Wed, 3 Dec 2025 11:40:45 +0800 Subject: [PATCH 1/2] fix(ble): fix hci log malloc failure crash (cherry picked from commit 734031311ad8554b600718bf8add68836121f72b) Co-authored-by: cjin --- components/bt/common/hci_log/bt_hci_log.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/bt/common/hci_log/bt_hci_log.c b/components/bt/common/hci_log/bt_hci_log.c index fa3de907d64..fef3760b3f2 100644 --- a/components/bt/common/hci_log/bt_hci_log.c +++ b/components/bt/common/hci_log/bt_hci_log.c @@ -225,6 +225,10 @@ esp_err_t IRAM_ATTR bt_hci_log_record_data(bt_hci_log_t *p_hci_log_ctl, char *st ts = esp_timer_get_time(); temp_buf = (uint8_t *)malloc(data_len + 8); + if (!temp_buf) { + return ESP_ERR_NO_MEM; + } + memset(temp_buf, 0x0, data_len + 8); memcpy(temp_buf, &ts, 8); From f2ef482efa17f1f2e880910a77f914a4201170ee Mon Sep 17 00:00:00 2001 From: cjin Date: Thu, 11 Dec 2025 08:51:11 +0800 Subject: [PATCH 2/2] fix(ble): fix pawr set subevent data length error --- components/bt/host/nimble/nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 9551ac31af0..32e8ddac582 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 9551ac31af0348d7de6cbe7527de3e5ba205460d +Subproject commit 32e8ddac58211e87cca910a08e025ab5f84fb4d4