Fix memory leak occurs every one second (#17516)

* Fix memory leak occurs every one second * Update src/lib/support/Pool.h Co-authored-by: Boris Zbarsky <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
project-chip · Oct 12, 2023 · fe2de04 · fe2de04
1 parent 3d3a158
commit fe2de04
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/lib/support/Pool.h b/src/lib/support/Pool.h
@@ -343,9 +343,17 @@ class HeapObjectPool : public internal::Statistics, public internal::PoolCommon<
             internal::HeapObjectListNode * node = mObjects.FindNode(object);
             if (node != nullptr)
             {
-                // Note that the node is not removed here; that is deferred until the end of the next pool iteration.
                 node->mObject = nullptr;
                 Platform::Delete(object);
+
+                // The node needs to be released immediately if we are not in the middle of iteration.
+                // Otherwise cleanup is deferred until all iteration on this pool completes and it's safe to release nodes.
+                if (mObjects.mIterationDepth == 0)
+                {
+                    node->Remove();
+                    Platform::Delete(node);
+                }
+
                 DecreaseUsage();
             }
         }