mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace #699 Fixed race condition in SDWebImageManager if one operation is cancelled, the completion block must not be called, otherwise it might race with a newer completion for the same object 

Conflicts:
	SDWebImage/SDWebImageManager.m
This commit is contained in:
Bogdan Poplauschi 2014-06-24 23:36:34 +03:00
parent 6e4fbafa55
commit f080e38fb8
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SDWebImage/SDWebImageManager.m
View File

@ -181,13 +181,15 @@
} }
id <SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *data, NSError *error, BOOL finished) { id <SDWebImageOperation> subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *data, NSError *error, BOOL finished) {
if (weakOperation.isCancelled) { if (weakOperation.isCancelled) {
dispatch_main_sync_safe(^{ // Do nothing if the operation was cancelled
completedBlock(nil, nil, SDImageCacheTypeNone, finished, url); // See #699 for more details
}); // if we would call the completedBlock, there could be a race condition between this block and another completedBlock for the same object, so if this one is called second, we will overwrite the new data
} }
else if (error) { else if (error) {
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
completedBlock(nil, error, SDImageCacheTypeNone, finished, url); if (!weakOperation.isCancelled) {
completedBlock(nil, error, SDImageCacheTypeNone, finished, url);
}
}); });
if (error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled && error.code != NSURLErrorTimedOut) { if (error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled && error.code != NSURLErrorTimedOut) {
@ -213,7 +215,9 @@
} }
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url); if (!weakOperation.isCancelled) {
completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url);
}
}); });
}); });
} }
@ -223,7 +227,9 @@
} }
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url); if (!weakOperation.isCancelled) {
completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url);
}
}); });
} }
} }
@ -244,7 +250,9 @@
} }
else if (image) { else if (image) {
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
completedBlock(image, nil, cacheType, YES, url); if (!weakOperation.isCancelled) {
completedBlock(image, nil, cacheType, YES, url);
}
}); });
@synchronized (self.runningOperations) { @synchronized (self.runningOperations) {
[self.runningOperations removeObject:operation]; [self.runningOperations removeObject:operation];
@ -253,7 +261,9 @@
else { else {
// Image not in cache and download disallowed by delegate // Image not in cache and download disallowed by delegate
dispatch_main_sync_safe(^{ dispatch_main_sync_safe(^{
completedBlock(nil, nil, SDImageCacheTypeNone, YES, url); if (!weakOperation.isCancelled) {
completedBlock(nil, nil, SDImageCacheTypeNone, YES, url);
}
}); });
@synchronized (self.runningOperations) { @synchronized (self.runningOperations) {
[self.runningOperations removeObject:operation]; [self.runningOperations removeObject:operation];