From 8b13cff2e250c2e6869f5c59e7d02f65c7a06289 Mon Sep 17 00:00:00 2001
From: Shreeyash <shreeyash.bhakare@espressif.com>
Date: Thu, 29 Jan 2026 18:30:11 +0530
Subject: [PATCH] fix(nimble): Fix host init assert when periodic sync is
 disabled

---
 nimble/host/src/ble_hs_conn.c          |  2 +-
 nimble/host/src/ble_hs_periodic_sync.c | 17 +++++++++++++++--
 nimble/host/src/ble_l2cap.c            |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nimble/host/src/ble_hs_conn.c b/nimble/host/src/ble_hs_conn.c
index 4506f89d7..1ff4b51b2 100644
--- a/nimble/host/src/ble_hs_conn.c
+++ b/nimble/host/src/ble_hs_conn.c
@@ -639,7 +639,7 @@ ble_hs_conn_init(void)
 #if !MYNEWT_VAL(MP_RUNTIME_ALLOC)
     size_t elem_mem_size = OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_MAX_CONNECTIONS), sizeof(struct ble_hs_conn));
 
-    if (!ble_hs_conn_elem_mem) {
+    if (!ble_hs_conn_elem_mem && elem_mem_size != 0) {
         ble_hs_conn_elem_mem = (os_membuf_t *)nimble_platform_mem_calloc(1,elem_mem_size * sizeof(os_membuf_t));
 
         if (!ble_hs_conn_elem_mem) {
diff --git a/nimble/host/src/ble_hs_periodic_sync.c b/nimble/host/src/ble_hs_periodic_sync.c
index d18ae3dc9..71ca5eee4 100644
--- a/nimble/host/src/ble_hs_periodic_sync.c
+++ b/nimble/host/src/ble_hs_periodic_sync.c
@@ -197,11 +197,24 @@ ble_hs_periodic_sync_init(void)
 
 #if MYNEWT_VAL(BLE_STATIC_TO_DYNAMIC)
     rc = ble_hs_periodic_sync_ensure_ctx();
-    if (rc != 0)
-    {
+    if (rc != 0) {
         return rc;
     }
+#endif
 
+    if (MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS) == 0) {
+        memset(&ble_hs_periodic_sync_pool, 0, sizeof(ble_hs_periodic_sync_pool));
+        rc = os_mempool_init(&ble_hs_periodic_sync_pool, 0,
+                             sizeof(struct ble_hs_periodic_sync), NULL,
+                             "ble_hs_periodic_disc_pool");
+        if (rc != 0) {
+            return BLE_HS_EOS;
+        }
+        SLIST_INIT(&g_ble_hs_periodic_sync_handles);
+        return 0;
+    }
+
+#if MYNEWT_VAL(BLE_STATIC_TO_DYNAMIC)
 #if !MYNEWT_VAL(MP_RUNTIME_ALLOC)
     if (!ble_hs_psync_elem_mem)
     {
diff --git a/nimble/host/src/ble_l2cap.c b/nimble/host/src/ble_l2cap.c
index 4b70b94f6..64b6d7fda 100644
--- a/nimble/host/src/ble_l2cap.c
+++ b/nimble/host/src/ble_l2cap.c
@@ -511,7 +511,7 @@ ble_l2cap_init(void)
     size_t chan_mem_bytes = OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_L2CAP_MAX_CHANS) +
                          MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM),
                          sizeof (struct ble_l2cap_chan)) * sizeof(os_membuf_t);
-    if (ble_l2cap_chan_mem == NULL) {
+    if (ble_l2cap_chan_mem == NULL && chan_mem_bytes != 0) {
         ble_l2cap_chan_mem = (os_membuf_t *)nimble_platform_mem_calloc(1, chan_mem_bytes);
         if (ble_l2cap_chan_mem == NULL) {
             nimble_platform_mem_free(ble_l2cap_ctx);