Fix AttributeCache forwarding callback

* Fix forwarded OnAttributeData callback losing data by copying the TLV reader before its state changes for cache update.
project-chip · Mar 23, 2022 · f6599d4 · f6599d4
1 parent d57c3b3
commit f6599d4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/app/AttributeCache.cpp b/src/app/AttributeCache.cpp
@@ -115,12 +115,23 @@ void AttributeCache::OnAttributeData(const ConcreteDataAttributePath & aPath, TL
     //
     VerifyOrDie(!aPath.IsListItemOperation());
 
+    // Copy the reader for forwarding
+    TLV::TLVReader * pDataCopy = nullptr;
+    if (apData)
+    {
+        pDataCopy = Platform::New<TLV::TLVReader>(*apData);
+    }
+
     UpdateCache(aPath, apData, aStatus);
 
     //
     // Forward the call through.
     //
-    mCallback.OnAttributeData(aPath, apData, aStatus);
+    mCallback.OnAttributeData(aPath, pDataCopy, aStatus);
+    if (pDataCopy)
+    {
+        Platform::Delete(pDataCopy);
+    }
 }
 
 CHIP_ERROR AttributeCache::Get(const ConcreteAttributePath & path, TLV::TLVReader & reader)