Fix memory leak when destroying ModeBase delegates (#28267)

* Fixes #28265 * Fixed typo.
project-chip · Jul 26, 2023 · 1d49d9e · 1d49d9e
1 parent b9de475
commit 1d49d9e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/src/dishwasher-mode.cpp b/examples/all-clusters-app/all-clusters-common/src/dishwasher-mode.cpp
@@ -85,7 +85,8 @@ void DishwasherMode::Shutdown()
     }
     if (gDishwasherModeDelegate != nullptr)
     {
-        gDishwasherModeDelegate->~DishwasherModeDelegate();
+        delete gDishwasherModeDelegate;
+        gDishwasherModeDelegate = nullptr;
     }
 }
 

diff --git a/examples/all-clusters-app/all-clusters-common/src/laundry-washer-mode.cpp b/examples/all-clusters-app/all-clusters-common/src/laundry-washer-mode.cpp
@@ -84,7 +84,8 @@ void LaundryWasherMode::Shutdown()
     }
     if (gLaundryWasherModeDelegate != nullptr)
     {
-        gLaundryWasherModeDelegate->~LaundryWasherModeDelegate();
+        delete gLaundryWasherModeDelegate;
+        gLaundryWasherModeDelegate = nullptr;
     }
 }
 

diff --git a/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp b/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp
@@ -97,7 +97,8 @@ void RvcRunMode::Shutdown()
     }
     if (gRvcRunModeDelegate != nullptr)
     {
-        gRvcRunModeDelegate->~RvcRunModeDelegate();
+        delete gRvcRunModeDelegate;
+        gRvcRunModeDelegate = nullptr;
     }
 }
 
@@ -180,7 +181,8 @@ void RvcCleanMode::Shutdown()
     }
     if (gRvcCleanModeDelegate != nullptr)
     {
-        gRvcCleanModeDelegate->~RvcCleanModeDelegate();
+        delete gRvcCleanModeDelegate;
+        gRvcCleanModeDelegate = nullptr;
     }
 }
 

diff --git a/examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp b/examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp
@@ -84,7 +84,8 @@ void RefrigeratorAndTemperatureControlledCabinetMode::Shutdown()
     }
     if (gTccModeDelegate != nullptr)
     {
-        gTccModeDelegate->~TccModeDelegate();
+        delete gTccModeDelegate;
+        gTccModeDelegate = nullptr;
     }
 }
 

diff --git a/src/app/clusters/mode-base-server/mode-base-server.h b/src/app/clusters/mode-base-server/mode-base-server.h
@@ -241,7 +241,7 @@ class Delegate
 // todo change once there is a clear public interface for the OnOff cluster data dependencies (#27508)
 static IntrusiveList<Instance> gModeBaseAliasesInstances;
 
-// This does not return a refernce to const IntrusiveList, because the caller might need
+// This does not return a reference to const IntrusiveList, because the caller might need
 // to change the state of the instances in the list and const IntrusiveList only allows
 // access to const Instance.
 IntrusiveList<Instance> & GetModeBaseInstanceList();