Iterate over parent endpoints chain to fill Aggregator PartsList prop…

…erly. (#19721)
project-chip · Jun 28, 2022 · 1057186 · 1057186
1 parent 07acbf6
commit 1057186
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp
@@ -82,13 +82,23 @@ CHIP_ERROR DescriptorAttrAccess::ReadPartsAttribute(EndpointId endpoint, Attribu
         err = aEncoder.EncodeList([endpoint](const auto & encoder) -> CHIP_ERROR {
             for (uint16_t index = 0; index < emberAfEndpointCount(); index++)
             {
-                if (emberAfEndpointIndexIsEnabled(index))
+                if (!emberAfEndpointIndexIsEnabled(index))
+                    continue;
+
+                uint16_t childIndex = index;
+                while (childIndex != chip::kInvalidListIndex)
                 {
-                    EndpointId composedEndpointId = emberAfParentEndpointFromIndex(index);
-                    if (composedEndpointId == chip::kInvalidEndpointId || composedEndpointId != endpoint)
-                        continue;
+                    EndpointId parentEndpointId = emberAfParentEndpointFromIndex(childIndex);
+                    if (parentEndpointId == chip::kInvalidEndpointId)
+                        break;
+
+                    if (parentEndpointId == endpoint)
+                    {
+                        ReturnErrorOnFailure(encoder.Encode(emberAfEndpointFromIndex(index)));
+                        break;
+                    }
 
-                    ReturnErrorOnFailure(encoder.Encode(emberAfEndpointFromIndex(index)));
+                    childIndex = emberAfIndexFromEndpoint(parentEndpointId);
                 }
             }