Replace #699 Fixed race condition in SDWebImageManager if one operation is cance…

…lled, the completion block must not be called, otherwise it might race with a newer completion for the same object

Conflicts:
	SDWebImage/SDWebImageManager.m

@@ -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(^{
-                        completedBlock(nil, nil, SDImageCacheTypeNone, finished, url);
-                    });
+                    // Do nothing if the operation was cancelled
+                    // 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(^{
+                        if (!weakOperation.isCancelled) {
                             completedBlock(nil, error, SDImageCacheTypeNone, finished, url);
                             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(^{
+                                if (!weakOperation.isCancelled) {
                                     completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url);
                                     completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url);
+                                }
                             });
                             });
                         });
                         });
                     }
                     }
@@ -223,7 +227,9 @@
                         }
                         }
 
 
                         dispatch_main_sync_safe(^{
                         dispatch_main_sync_safe(^{
+                            if (!weakOperation.isCancelled) {
                                 completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url);
                                 completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url);
+                            }
                         });
                         });
                     }
                     }
                 }
                 }
@@ -244,7 +250,9 @@
         }
         }
         else if (image) {
         else if (image) {
             dispatch_main_sync_safe(^{
             dispatch_main_sync_safe(^{
+                if (!weakOperation.isCancelled) {
                     completedBlock(image, nil, cacheType, YES, url);
                     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(^{
+                if (!weakOperation.isCancelled) {
                     completedBlock(nil, nil, SDImageCacheTypeNone, YES, url);
                     completedBlock(nil, nil, SDImageCacheTypeNone, YES, url);
+                }
             });
             });
             @synchronized (self.runningOperations) {
             @synchronized (self.runningOperations) {
                 [self.runningOperations removeObject:operation];
                 [self.runningOperations removeObject:operation];