From a81c131baf1a0d656c7d967cc1d19a8053a123f9 Mon Sep 17 00:00:00 2001 From: cjin Date: Thu, 11 Dec 2025 08:48:22 +0800 Subject: [PATCH 1/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 07192bf01b..6b9c4d1f5b 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 07192bf01b09c44a185e8a6e99857f8d57ca4f14 +Subproject commit 6b9c4d1f5b73369b874dc7e62f1831b5f0809586 From f7cd3ded5e17fff6c037691fe661f8e54972396e Mon Sep 17 00:00:00 2001 From: Jin Chen Date: Wed, 3 Dec 2025 11:40:40 +0800 Subject: [PATCH 2/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 2f664e2062..4ce636999b 100644 --- a/components/bt/common/hci_log/bt_hci_log.c +++ b/components/bt/common/hci_log/bt_hci_log.c @@ -220,6 +220,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);