Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-26 13:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Capture of autoreleasing out parameter inside autorelease pool that may exit before method returns" (#3886)

Browse Source
This commit is contained in:
A Cœur
2022-10-11 07:08:47 +08:00
committed by GitHub
parent f5ab3db978
commit cc5ae321a5
3 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
macosx/FileOutlineController.mm
View File

@@ -32,12 +32,6 @@ typedef NS_ENUM(unsigned int, filePriorityMenuTag) { //
@property(nonatomic, readonly) NSMenu* menu;
- (NSUInteger)findFileNode:(FileListNode*)node
inList:(NSArray<FileListNode*>*)list
atIndexes:(NSIndexSet*)range
currentParent:(FileListNode*)currentParent
finalParent:(FileListNode**)parent;
@end
@implementation FileOutlineController
@@ -694,35 +688,42 @@ typedef NS_ENUM(unsigned int, filePriorityMenuTag) { //
{
NSAssert(!node.isFolder, @"Looking up folder node!");
__block FileListNode* retNode;
__block NSUInteger retIndex = NSNotFound;
[list enumerateObjectsAtIndexes:indexes options:NSEnumerationConcurrent
usingBlock:^(FileListNode* checkNode, NSUInteger index, BOOL* stop) {
if ([checkNode.indexes containsIndex:node.indexes.firstIndex])
{
if (!checkNode.isFolder)
using FindFileNode = void (^)(FileListNode*, NSArray<FileListNode*>*, NSIndexSet*, FileListNode*);
__weak __block FindFileNode weakFindFileNode;
FindFileNode findFileNode;
weakFindFileNode = findFileNode = ^(FileListNode* node, NSArray<FileListNode*>* list, NSIndexSet* indexes, FileListNode* currentParent) {
[list enumerateObjectsAtIndexes:indexes options:NSEnumerationConcurrent
usingBlock:^(FileListNode* checkNode, NSUInteger index, BOOL* stop) {
if ([checkNode.indexes containsIndex:node.indexes.firstIndex])
{
NSAssert2([checkNode isEqualTo:node], @"Expected file nodes to be equal: %@ %@", checkNode, node);
*parent = currentParent;
retIndex = index;
}
else
{
NSUInteger const subIndex = [self
findFileNode:node
inList:checkNode.children
atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, checkNode.children.count)]
currentParent:checkNode
finalParent:parent];
NSAssert(subIndex != NSNotFound, @"We didn't find an expected file node.");
retIndex = subIndex;
if (!checkNode.isFolder)
{
NSAssert([checkNode isEqualTo:node], @"Expected file nodes to be equal: %@ %@", checkNode, node);
retNode = currentParent;
retIndex = index;
}
else
{
weakFindFileNode(
node,
checkNode.children,
[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, checkNode.children.count)],
checkNode);
NSAssert(retIndex != NSNotFound, @"We didn't find an expected file node.");
}
*stop = YES;
}
}];
};
findFileNode(node, list, indexes, currentParent);
*stop = YES;
}
}];
if (retNode)
{
*parent = retNode;
}
return retIndex;
}