[darwin] ROOT LEAK: <chip::DeviceLayer::Internal::Ble*DelegateImpl (#…

…22374) * [darwin] ROOT LEAK: <chip::DeviceLayer::Internal::Ble*DelegateImpl * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Sep 3, 2022 · ba8a495 · ba8a495
1 parent b1e29d4
commit ba8a495
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/platform/Darwin/BLEManagerImpl.cpp b/src/platform/Darwin/BLEManagerImpl.cpp
@@ -52,10 +52,42 @@ CHIP_ERROR BLEManagerImpl::_Init()
     BleApplicationDelegateImpl * appDelegate   = new BleApplicationDelegateImpl();
     BleConnectionDelegateImpl * connDelegate   = new BleConnectionDelegateImpl();
     BlePlatformDelegateImpl * platformDelegate = new BlePlatformDelegateImpl();
+
+    mApplicationDelegate = appDelegate;
+    mConnectionDelegate  = connDelegate;
+    mPlatformDelegate    = platformDelegate;
+
     err = BleLayer::Init(platformDelegate, connDelegate, appDelegate, &DeviceLayer::SystemLayer());
+
+    if (CHIP_NO_ERROR != err)
+    {
+        _Shutdown();
+    }
+
     return err;
 }
 
+void BLEManagerImpl::_Shutdown()
+{
+    if (mApplicationDelegate)
+    {
+        delete mApplicationDelegate;
+        mApplicationDelegate = nullptr;
+    }
+
+    if (mConnectionDelegate)
+    {
+        delete mConnectionDelegate;
+        mConnectionDelegate = nullptr;
+    }
+
+    if (mPlatformDelegate)
+    {
+        delete mPlatformDelegate;
+        mPlatformDelegate = nullptr;
+    }
+}
+
 bool BLEManagerImpl::_IsAdvertisingEnabled(void)
 {
     ChipLogDetail(DeviceLayer, "%s", __FUNCTION__);

diff --git a/src/platform/Darwin/BLEManagerImpl.h b/src/platform/Darwin/BLEManagerImpl.h
@@ -47,7 +47,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer
     // ===== Members that implement the BLEManager internal interface.
 
     CHIP_ERROR _Init(void);
-    void _Shutdown() {}
+    void _Shutdown();
     bool _IsAdvertisingEnabled(void);
     CHIP_ERROR _SetAdvertisingEnabled(bool val);
     bool _IsAdvertising(void);
@@ -64,6 +64,10 @@ class BLEManagerImpl final : public BLEManager, private BleLayer
     friend BLEManagerImpl & BLEMgrImpl(void);
 
     static BLEManagerImpl sInstance;
+
+    BleConnectionDelegate * mConnectionDelegate   = nullptr;
+    BlePlatformDelegate * mPlatformDelegate       = nullptr;
+    BleApplicationDelegate * mApplicationDelegate = nullptr;
 };
 
 /**