Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't touch member variables from async dispatch. #21456

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/darwin/Framework/CHIP/MTRBaseDevice.mm
Original file line number Diff line number Diff line change
Expand Up @@ -1384,16 +1384,20 @@ - (instancetype)initWithPath:(const ConcreteEventPath &)path
{
__block NSArray * attributeReports = mAttributeReports;
mAttributeReports = nil;
__block auto attributeCallback = mAttributeReportCallback;

__block NSArray * eventReports = mEventReports;
mEventReports = nil;
if (mAttributeReportCallback && attributeReports.count) {
__block auto eventCallback = mEventReportCallback;

if (attributeCallback != nil && attributeReports.count) {
dispatch_async(mQueue, ^{
mAttributeReportCallback(attributeReports);
attributeCallback(attributeReports);
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
});
}
if (mEventReportCallback && eventReports.count) {
if (eventCallback != nil && eventReports.count) {
dispatch_async(mQueue, ^{
mEventReportCallback(eventReports);
eventCallback(eventReports);
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
});
}
}
Expand Down