Merge pull request #3403 from dreampiggy/revert_isCancelled_block_with_recursive

Fix the crash because of SDWebImageCombinedOperation recursive lock

SDWebImage/Core/SDWebImageManager.h

@@ -29,6 +29,9 @@ typedef void(^SDInternalCompletionBlock)(UIImage * _Nullable image, NSData * _Nu
  */
 - (void)cancel;
 
+/// Whether the operation has been cancelled.
+@property (nonatomic, assign, readonly, getter=isCancelled) BOOL cancelled;
+
 /**
  The cache operation from the image cache query
  */

SDWebImage/Core/SDWebImageManager.m

@@ -17,9 +17,7 @@
 static id<SDImageCache> _defaultImageCache;
 static id<SDImageLoader> _defaultImageLoader;
 
-@interface SDWebImageCombinedOperation () {
+@interface SDWebImageCombinedOperation ()
-    SD_LOCK_DECLARE(_cancelledLock); // a lock to keep the access to `cancelled` thread-safe
-}
 
 @property (assign, nonatomic, getter = isCancelled) BOOL cancelled;
 @property (strong, nonatomic, readwrite, nullable) id<SDWebImageOperation> loaderOperation;
@@ -805,39 +803,30 @@ static id<SDImageLoader> _defaultImageLoader;
 
 @implementation SDWebImageCombinedOperation
 
-- (instancetype)init {
-    if (self = [super init]) {
-        SD_LOCK_INIT(_cancelledLock);
-    }
-
-    return self;
-}
-
 - (BOOL)isCancelled {
-    BOOL isCancelled = NO;
+    // Need recursive lock (user's cancel block may check isCancelled), do not use SD_LOCK
-    SD_LOCK(_cancelledLock);
+    @synchronized (self) {
-    isCancelled = _cancelled;
+        return _cancelled;
-    SD_UNLOCK(_cancelledLock);
+    }
-    return isCancelled;
 }
 
 - (void)cancel {
-    SD_LOCK(_cancelledLock);
+    // Need recursive lock (user's cancel block may check isCancelled), do not use SD_LOCK
-    if (_cancelled) {
+    @synchronized(self) {
-        SD_UNLOCK(_cancelledLock);
+        if (_cancelled) {
-        return;
+            return;
+        }
+        _cancelled = YES;
+        if (self.cacheOperation) {
+            [self.cacheOperation cancel];
+            self.cacheOperation = nil;
+        }
+        if (self.loaderOperation) {
+            [self.loaderOperation cancel];
+            self.loaderOperation = nil;
+        }
+        [self.manager safelyRemoveOperationFromRunning:self];
     }
-    _cancelled = YES;
-    if (self.cacheOperation) {
-        [self.cacheOperation cancel];
-        self.cacheOperation = nil;
-    }
-    if (self.loaderOperation) {
-        [self.loaderOperation cancel];
-        self.loaderOperation = nil;
-    }
-    [self.manager safelyRemoveOperationFromRunning:self];
-    SD_UNLOCK(_cancelledLock);
 }
 
 @end