Revert "[nrf fromtree] [app] Fix DeferredAttributePersister memory le…

…ak (project-chip#31075)" This reverts commit e79b0cf.
maciejbaczmanski · May 8, 2024 · 5251d62 · 5251d62
1 parent 15207ca
commit 5251d62
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/src/app/DeferredAttributePersistenceProvider.cpp b/src/app/DeferredAttributePersistenceProvider.cpp
@@ -39,7 +39,7 @@ void DeferredAttribute::Flush(AttributePersistenceProvider & persister)
 {
     VerifyOrReturn(IsArmed());
     persister.WriteValue(mPath, ByteSpan(mValue.Get(), mValue.AllocatedSize()));
-    mValue.Free();
+    mValue.Release();
 }
 
 CHIP_ERROR DeferredAttributePersistenceProvider::WriteValue(const ConcreteAttributePath & aPath, const ByteSpan & aValue)

diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
@@ -1141,8 +1141,8 @@ - (void)readAttributePaths:(NSArray<MTRAttributeRequestPath *> * _Nullable)attri
             //
             callback->AdoptReadClient(std::move(readClient));
             callback.release();
-            IgnoreUnusedVariable(attributePathParamsList.Release());
-            IgnoreUnusedVariable(eventPathParamsList.Release());
+            attributePathParamsList.Release();
+            eventPathParamsList.Release();
             return err;
         });
     std::move(*bridge).DispatchAction(self);

diff --git a/src/lib/support/ScopedBuffer.h b/src/lib/support/ScopedBuffer.h
@@ -25,7 +25,6 @@
 #pragma once
 
 #include <lib/support/CHIPMem.h>
-#include <lib/support/CodeUtils.h>
 
 #include <type_traits>
 #include <utility>
@@ -85,11 +84,10 @@ class ScopedMemoryBufferBase
     const void * Ptr() const { return mBuffer; }
 
     /**
-     * Releases the underlying buffer.
-     *
-     * The buffer stops being managed and will not be auto-freed.
+     * Releases the undelying buffer. Buffer stops being managed and will not be
+     * auto-freed.
      */
-    CHECK_RETURN_VALUE void * Release()
+    void * Release()
     {
         void * buffer = mBuffer;
         mBuffer       = nullptr;
@@ -141,18 +139,13 @@ class ScopedMemoryBuffer : public Impl::ScopedMemoryBufferBase<MemoryManagement>
 
     static_assert(std::is_trivially_destructible<T>::value, "Destructors won't get run");
 
-    T * Get() { return static_cast<T *>(Base::Ptr()); }
-    T & operator[](size_t index) { return Get()[index]; }
+    inline T * Get() { return static_cast<T *>(Base::Ptr()); }
+    inline T & operator[](size_t index) { return Get()[index]; }
 
-    const T * Get() const { return static_cast<const T *>(Base::Ptr()); }
-    const T & operator[](size_t index) const { return Get()[index]; }
+    inline const T * Get() const { return static_cast<const T *>(Base::Ptr()); }
+    inline const T & operator[](size_t index) const { return Get()[index]; }
 
-    /**
-     * Releases the underlying buffer.
-     *
-     * The buffer stops being managed and will not be auto-freed.
-     */
-    CHECK_RETURN_VALUE T * Release() { return static_cast<T *>(Base::Release()); }
+    inline T * Release() { return static_cast<T *>(Base::Release()); }
 
     ScopedMemoryBuffer & Calloc(size_t elementCount)
     {
@@ -229,12 +222,7 @@ class ScopedMemoryBufferWithSize : public ScopedMemoryBuffer<T>
         ScopedMemoryBuffer<T>::Free();
     }
 
-    /**
-     * Releases the underlying buffer.
-     *
-     * The buffer stops being managed and will not be auto-freed.
-     */
-    CHECK_RETURN_VALUE T * Release()
+    T * Release()
     {
         T * buffer = ScopedMemoryBuffer<T>::Release();
         mCount     = 0;