Merge pull request SDWebImage#2386 from zhongwuzw/fix-nullable

Fix nullable key when cancel image load operation
Henrs · Jul 18, 2018 · dbbfbd7 · dbbfbd7
2 parents 98a2d9a + 593feb6
commit dbbfbd7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/SDWebImage/UIImageView+WebCache.h b/SDWebImage/UIImageView+WebCache.h
@@ -27,8 +27,7 @@
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:MyIdentifier];
  
     if (cell == nil) {
-        cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:MyIdentifier]
-                 autorelease];
+        cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:MyIdentifier];
     }
  
     // Here we use the provided sd_setImageWithURL: method to load the web image

diff --git a/SDWebImage/UIView+WebCacheOperation.m b/SDWebImage/UIView+WebCacheOperation.m
@@ -42,18 +42,21 @@ - (void)sd_setImageLoadOperation:(nullable id<SDWebImageOperation>)operation for
 }
 
 - (void)sd_cancelImageLoadOperationWithKey:(nullable NSString *)key {
-    // Cancel in progress downloader from queue
-    SDOperationsDictionary *operationDictionary = [self sd_operationDictionary];
-    id<SDWebImageOperation> operation;
-    @synchronized (self) {
-        operation = [operationDictionary objectForKey:key];
-    }
-    if (operation) {
-        if ([operation conformsToProtocol:@protocol(SDWebImageOperation)]){
-            [operation cancel];
-        }
+    if (key) {
+        // Cancel in progress downloader from queue
+        SDOperationsDictionary *operationDictionary = [self sd_operationDictionary];
+        id<SDWebImageOperation> operation;
+
         @synchronized (self) {
-            [operationDictionary removeObjectForKey:key];
+            operation = [operationDictionary objectForKey:key];
+        }
+        if (operation) {
+            if ([operation conformsToProtocol:@protocol(SDWebImageOperation)]) {
+                [operation cancel];
+            }
+            @synchronized (self) {
+                [operationDictionary removeObjectForKey:key];
+            }
         }
     }
 }