Merge branch 'bugfix/memory_cleanup_optimization' into 'master'

Nimble: Fixes for memory leak / optimization See merge request espressif/esp-idf!23759
espressif · May 25, 2023 · 1937282 · 1937282
2 parents 451a0f1 + 7296888
commit 1937282
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
@@ -479,7 +479,7 @@ config BT_NIMBLE_HS_STOP_TIMEOUT_MS
 config BT_NIMBLE_HOST_BASED_PRIVACY
     bool "Enable host based privacy for random address."
     default n
-    depends on BT_NIMBLE_ENABLED && !IDF_TARGET_ESP32
+    depends on BT_NIMBLE_ENABLED && IDF_TARGET_ESP32
     help
         Use this option to do host based Random Private Address resolution.
         If this option is disabled then controller based privacy is used.

diff --git a/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c b/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c
@@ -216,6 +216,7 @@ static int host_rcv_pkt(uint8_t *data, uint16_t len)
             assert(evbuf != NULL);
         }
 
+        memset(evbuf, 0, sizeof *evbuf);
         memcpy(evbuf, &data[1], totlen);
 
         rc = ble_hci_trans_ll_evt_tx(evbuf);

diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
+2 −0		nimble/host/include/host/ble_hs_pvcy.h
+2 −0		nimble/host/src/ble_gatts.c
+6 −0		nimble/host/src/ble_hs.c
+5 −0		nimble/host/src/ble_hs_resolv.c
+2 −0		porting/nimble/src/nimble_port.c
+10 −0		porting/npl/freertos/src/npl_os_freertos.c