Skip to content

Commit

Permalink
Merge pull request #4643 from nextcloud/bugfix/finder-sync-crashing
Browse files Browse the repository at this point in the history
Ensure the dispatch source only gets deallocated after the dispatch_source_cancel is done, avoiding crashing of the Finder Sync Extension on macOS
  • Loading branch information
claucambra authored Jul 1, 2022
2 parents 8ce0842 + a74f9b3 commit 60960e7
Showing 1 changed file with 13 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,24 @@ - (void)closeConnection
NSLog(@"Closing connection.");

if(self.readSource) {
// Since dispatch_source_cancel works asynchronously, if we deallocate the dispatch source here then we can
// cause a crash. So instead we strongly hold a reference to the read source and deallocate it asynchronously
// with the handler.
__block dispatch_source_t previousReadSource = self.readSource;
dispatch_source_set_cancel_handler(self.readSource, ^{
previousReadSource = nil;
});
dispatch_source_cancel(self.readSource);
// The readSource is still alive due to the other reference and will be deallocated by the cancel handler
self.readSource = nil;
}

if(self.writeSource) {
// Same deal with the write source
__block dispatch_source_t previousWriteSource = self.writeSource;
dispatch_source_set_cancel_handler(self.writeSource, ^{
previousWriteSource = nil;
});
dispatch_source_cancel(self.writeSource);
self.writeSource = nil;
}
Expand Down

0 comments on commit 60960e7

Please sign in to comment.