Verify block is still alive before calling it in task callbacks (#7054)

Author: paulb777

FirebaseStorage/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 7.3.0
+- [Fixed] Verify block is still alive before calling it in task callbacks. (#7051)
+
 # 7.1.0
 - [Fixed] Remove explicit MobileCoreServices library linkage from podspec. (#6850)
 

FirebaseStorage/Sources/FIRStorageDeleteTask.m

@@ -61,8 +61,6 @@ - (void)enqueue {
 
     fetcher.comment = @"DeleteTask";
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *_Nullable data, NSError *_Nullable error) {
       if (!self.error) {
         self.error = [FIRStorageErrors errorWithServerError:error reference:self.reference];
@@ -72,10 +70,12 @@ - (void)enqueue {
       }
       self->_fetcherCompletion = nil;
     };
-#pragma clang diangostic pop
 
     [fetcher beginFetchWithCompletionHandler:^(NSData *_Nullable data, NSError *_Nullable error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageDeleteTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 }

FirebaseStorage/Sources/FIRStorageDownloadTask.m

@@ -109,9 +109,6 @@ - (void)enqueueWithData:(nullable NSData *)resumeData {
     }
 
     strongSelf->_fetcher = fetcher;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *data, NSError *error) {
       // Fire last progress updates
       [self fireHandlersForStatus:FIRStorageTaskStatusProgress snapshot:self.snapshot];
@@ -137,11 +134,13 @@ - (void)enqueueWithData:(nullable NSData *)resumeData {
       [self removeAllObservers];
       self->_fetcherCompletion = nil;
     };
-#pragma clang diagnostic pop
 
     strongSelf.state = FIRStorageTaskStateRunning;
     [strongSelf.fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageDownloadTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 }

FirebaseStorage/Sources/FIRStorageGetDownloadURLTask.m

@@ -88,8 +88,6 @@ - (void)enqueue {
     strongSelf->_fetcher = fetcher;
     fetcher.comment = @"GetDownloadURLTask";
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *data, NSError *error) {
       NSURL *downloadURL;
       if (error) {
@@ -116,9 +114,11 @@ - (void)enqueue {
 
       self->_fetcherCompletion = nil;
     };
-#pragma clang diagnostic pop
     [fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageGetDownloadURLTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 };

FirebaseStorage/Sources/FIRStorageGetMetadataTask.m

@@ -64,8 +64,6 @@ - (void)enqueue {
     strongSelf->_fetcher = fetcher;
     fetcher.comment = @"GetMetadataTask";
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *data, NSError *error) {
       FIRStorageMetadata *metadata;
       if (error) {
@@ -87,10 +85,12 @@ - (void)enqueue {
       }
       self->_fetcherCompletion = nil;
     };
-#pragma clang diagnostic pop
 
     [fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageGetMetadataTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 }

FirebaseStorage/Sources/FIRStorageListTask.m

@@ -93,8 +93,6 @@ - (void)enqueue {
     strongSelf->_fetcher = fetcher;
     fetcher.comment = @"ListTask";
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *data, NSError *error) {
       FIRStorageListResult *listResult;
       if (error) {
@@ -116,10 +114,12 @@ - (void)enqueue {
       // Remove retain cycle set up by `strongSelf->_fetcherCompletion`
       self->_fetcherCompletion = nil;
     };
-#pragma clang diagnostic pop
 
     [fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageListTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 }

FirebaseStorage/Sources/FIRStorageUpdateMetadataTask.m

@@ -71,8 +71,6 @@ - (void)enqueue {
     GTMSessionFetcher *fetcher = [strongSelf.fetcherService fetcherWithRequest:request];
     strongSelf->_fetcher = fetcher;
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-retain-cycles"
     strongSelf->_fetcherCompletion = ^(NSData *data, NSError *error) {
       FIRStorageMetadata *metadata;
       if (error) {
@@ -94,12 +92,14 @@ - (void)enqueue {
       }
       self->_fetcherCompletion = nil;
     };
-#pragma clang diagnostic pop
 
     fetcher.comment = @"UpdateMetadataTask";
 
     [fetcher beginFetchWithCompletionHandler:^(NSData *data, NSError *error) {
-      weakSelf.fetcherCompletion(data, error);
+      FIRStorageUpdateMetadataTask *strongSelf = weakSelf;
+      if (strongSelf.fetcherCompletion) {
+        strongSelf.fetcherCompletion(data, error);
+      }
     }];
   }];
 }

FirebaseStorage/Sources/FIRStorageUploadTask.m

@@ -178,8 +178,9 @@ - (void)enqueue {
 
     [strongSelf->_uploadFetcher
         beginFetchWithCompletionHandler:^(NSData *_Nullable data, NSError *_Nullable error) {
-          if (weakSelf.fetcherCompletion != nil) {
-            weakSelf.fetcherCompletion(data, error);
+          FIRStorageUploadTask *strongSelf = weakSelf;
+          if (strongSelf.fetcherCompletion) {
+            strongSelf.fetcherCompletion(data, error);
           }
         }];
   }];