Ensure the invalid URLSeesion will receive the cancel callback and do…

…es not trigger the any exception from framework
SDWebImage · Apr 6, 2021 · 90c0906 · 90c0906
1 parent d1c75d8
commit 90c0906
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/SDWebImage/Core/SDWebImageDownloader.m b/SDWebImage/Core/SDWebImageDownloader.m
@@ -140,11 +140,12 @@ - (instancetype)initWithConfig:(SDWebImageDownloaderConfig *)config {
 }
 
 - (void)dealloc {
-    [self.session invalidateAndCancel];
-    self.session = nil;
-
     [self.downloadQueue cancelAllOperations];
     [self.config removeObserver:self forKeyPath:NSStringFromSelector(@selector(maxConcurrentDownloads)) context:SDWebImageDownloaderContext];
+
+    // Invalide the URLSession after all operations been cancelled
+    [self.session invalidateAndCancel];
+    self.session = nil;
 }
 
 - (void)invalidateSessionAndCancel:(BOOL)cancelPendingOperations {

diff --git a/SDWebImage/Core/SDWebImageDownloaderOperation.m b/SDWebImage/Core/SDWebImageDownloaderOperation.m
@@ -194,6 +194,13 @@ - (void)start {
             }
         }
 
+        if (!session.delegate) {
+            // Session been invalid and has no delegate at all
+            [self callCompletionBlocksWithError:[NSError errorWithDomain:SDWebImageErrorDomain code:SDWebImageErrorInvalidDownloadOperation userInfo:@{NSLocalizedDescriptionKey : @"Session delegate is nil and invalid"}]];
+            [self reset];
+            return;
+        }
+
         self.dataTask = [session dataTaskWithRequest:self.request];
         self.executing = YES;
     }