FIRStorageUploadTask: validate content just before uploading (#2350)

firebase · Mar 3, 2019 · d376ee1 · d376ee1
1 parent 6c4ee95
commit d376ee1
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Firebase/Storage/FIRStorageUploadTask.m b/Firebase/Storage/FIRStorageUploadTask.m
@@ -72,20 +72,20 @@ - (void)dealloc {
 - (void)enqueue {
   __weak FIRStorageUploadTask *weakSelf = self;
 
-  NSError *contentValidationError;
-  if (![self isContentToUploadValid:&contentValidationError]) {
-    self.error = contentValidationError;
-    [self finishTaskWithStatus:FIRStorageTaskStatusFailure snapshot:self.snapshot];
-    return;
-  }
-
   [self dispatchAsync:^() {
     FIRStorageUploadTask *strongSelf = weakSelf;
 
     if (!strongSelf) {
       return;
     }
 
+    NSError *contentValidationError;
+    if (![strongSelf isContentToUploadValid:&contentValidationError]) {
+      strongSelf.error = contentValidationError;
+      [strongSelf finishTaskWithStatus:FIRStorageTaskStatusFailure snapshot:strongSelf.snapshot];
+      return;
+    }
+
     strongSelf.state = FIRStorageTaskStateQueueing;
 
     NSMutableURLRequest *request = [strongSelf.baseRequest mutableCopy];