Fix the crash seen when cleaning up MTRDiagnosticsLogHandler

nivi-apple · Nov 9, 2023 · e0d286c · e0d286c
1 parent 2aaaf14
commit e0d286c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -1401,14 +1401,16 @@ - (void)_invokeCompletion:(void (^)(NSURL * _Nullable logResult, NSError * error
                     queue:(dispatch_queue_t)queue
                     error:(NSError * _Nullable)error
 {
-    if (self->_diagnosticLogsTransferHandler != nil) {
-        self->_diagnosticLogsTransferHandler->Reset();
-        delete (self->_diagnosticLogsTransferHandler);
-        self->_diagnosticLogsTransferHandler = nil;
-    }
     dispatch_async(queue, ^{
         completion(filepath, error);
     });
+
+    dispatch_async(self.queue, ^{
+        if (self->_diagnosticLogsTransferHandler != nil) {
+            delete (self->_diagnosticLogsTransferHandler);
+            self->_diagnosticLogsTransferHandler = nil;
+        }
+    });
 }
 
 - (void)_invokeCompletionWithError:(void (^)(NSURL * _Nullable logResult, NSError * error))completion

diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.mm b/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.mm
@@ -92,6 +92,7 @@
     } else if (event.EventType != TransferSession::OutputEventType::kMsgToSend || !event.msgTypeData.HasMessageType(MessageType::BlockAckEOF)) {
         error = CHIP_ERROR_INTERNAL;
     }
+    Reset();
 
     // Notify the MTRDevice via the callback that the BDX transfer has completed with error or success.
     if (mCallback) {