[Darwin] MTRBaseSubscriptionCallback mInterimReportBlock should be ca…

…ncelled and nil-ed sooner for OnError case (#29500)
project-chip · Mar 4, 2024 · 2254600 · 2254600
1 parent ef059fc
commit 2254600
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.mm b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.mm
@@ -35,6 +35,12 @@
 // Reports attribute and event data if any exists
 void MTRBaseSubscriptionCallback::ReportData()
 {
+    // At data reporting time, nil out scheduled or currently running interimReportBlock
+    if (mInterimReportBlock) {
+        dispatch_block_cancel(mInterimReportBlock); // no-op when running from mInterimReportBlock
+        mInterimReportBlock = nil;
+    }
+
     __block NSArray * attributeReports = mAttributeReports;
     mAttributeReports = nil;
     auto attributeCallback = mAttributeReportCallback;
@@ -59,7 +65,6 @@
     }
 
     mInterimReportBlock = dispatch_block_create(DISPATCH_BLOCK_INHERIT_QOS_CLASS, ^{
-        mInterimReportBlock = nil;
         ReportData();
         // Allocate reports arrays to continue accumulation
         mAttributeReports = [NSMutableArray new];
@@ -71,10 +76,6 @@
 
 void MTRBaseSubscriptionCallback::OnReportEnd()
 {
-    if (mInterimReportBlock) {
-        dispatch_block_cancel(mInterimReportBlock);
-        mInterimReportBlock = nil;
-    }
     ReportData();
     if (mReportEndHandler) {
         mReportEndHandler();