Merge pull request #2048 from dreampiggy/fix_cancelBlock_multi_thread_issue

Fix #1941 by placing a lock to avoid multi-thread issue for SDWebImageCombinedOperation cancelBlock

@@ -228,11 +228,14 @@
                     [self safelyRemoveOperationFromRunning:strongOperation];
                     [self safelyRemoveOperationFromRunning:strongOperation];
                 }
                 }
             }];
             }];
-            operation.cancelBlock = ^{
-                [self.imageDownloader cancel:subOperationToken];
-                __strong __typeof(weakOperation) strongOperation = weakOperation;
-                [self safelyRemoveOperationFromRunning:strongOperation];
-            };
+            @synchronized(operation) {
+                // Need same lock to ensure cancelBlock called because cancel method can be called in different queue
+                operation.cancelBlock = ^{
+                    [self.imageDownloader cancel:subOperationToken];
+                    __strong __typeof(weakOperation) strongOperation = weakOperation;
+                    [self safelyRemoveOperationFromRunning:strongOperation];
+                };
+            }
         } else if (cachedImage) {
         } else if (cachedImage) {
             __strong __typeof(weakOperation) strongOperation = weakOperation;
             __strong __typeof(weakOperation) strongOperation = weakOperation;
             [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:cachedImage data:cachedData error:nil cacheType:cacheType finished:YES url:url];
             [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:cachedImage data:cachedData error:nil cacheType:cacheType finished:YES url:url];
@@ -319,18 +322,16 @@
 }
 }
 
 
 - (void)cancel {
 - (void)cancel {
-    self.cancelled = YES;
-    if (self.cacheOperation) {
-        [self.cacheOperation cancel];
-        self.cacheOperation = nil;
-    }
-    if (self.cancelBlock) {
-        self.cancelBlock();
-        
-        // TODO: this is a temporary fix to #809.
-        // Until we can figure the exact cause of the crash, going with the ivar instead of the setter
-//        self.cancelBlock = nil;
-        _cancelBlock = nil;
+    @synchronized(self) {
+        self.cancelled = YES;
+        if (self.cacheOperation) {
+            [self.cacheOperation cancel];
+            self.cacheOperation = nil;
+        }
+        if (self.cancelBlock) {
+            self.cancelBlock();
+            self.cancelBlock = nil;
+        }
     }
     }
 }
 }