FIRStorageUploadTask: fail on invalid file URL

Example/Storage/Tests/Unit/FIRStorageReferenceTests.m

@@ -162,4 +162,29 @@ - (void)testCopy {
   XCTAssertNotEqual(ref, copiedRef);
 }
 
+- (void)testReferenceWithNonExistentFileFailsWithCompletion {
+  NSString *tempFilePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"temp.data"];
+  FIRStorageReference *ref = [self.storage referenceWithPath:tempFilePath];
+
+  NSURL *dummyFileURL = [NSURL fileURLWithPath:@"some_non_existing-folder/file.data"];
+
+  XCTestExpectation *expectation = [self expectationWithDescription:@"completionExpectation"];
+
+  [ref putFile:dummyFileURL
+        metadata:nil
+      completion:^(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error) {
+        [expectation fulfill];
+        XCTAssertNotNil(error);
+        XCTAssertNil(metadata);
+
+        XCTAssertEqualObjects(error.domain, FIRStorageErrorDomain);
+        XCTAssertEqual(error.code, FIRStorageErrorCodeUnknown);
+        XCTAssertEqualObjects(
+            error.localizedDescription,
+            @"File at URL: file:///some_non_existing-folder/file.data is not reachable");
+      }];
+
+  [self waitForExpectationsWithTimeout:0.5 handler:NULL];
+}
+
 @end

Firebase/Storage/FIRStorageUploadTask.m

@@ -72,6 +72,13 @@ - (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;
 
@@ -145,9 +152,8 @@ - (void)enqueue {
         self.state = FIRStorageTaskStateFailed;
         self.error = [FIRStorageErrors errorWithServerError:error reference:self.reference];
         self.metadata = self->_uploadMetadata;
-        [self fireHandlersForStatus:FIRStorageTaskStatusFailure snapshot:self.snapshot];
-        [self removeAllObservers];
-        self->_fetcherCompletion = nil;
+
+        [self finishTaskWithStatus:FIRStorageTaskStatusFailure snapshot:self.snapshot];
         return;
       }
 
@@ -164,9 +170,7 @@ - (void)enqueue {
         self.error = [FIRStorageErrors errorWithInvalidRequest:data];
       }
 
-      [self fireHandlersForStatus:FIRStorageTaskStatusSuccess snapshot:self.snapshot];
-      [self removeAllObservers];
-      self->_fetcherCompletion = nil;
+      [self finishTaskWithStatus:FIRStorageTaskStatusSuccess snapshot:self.snapshot];
     };
 #pragma clang diagnostic pop
 
@@ -177,6 +181,37 @@ - (void)enqueue {
   }];
 }
 
+- (void)finishTaskWithStatus:(FIRStorageTaskStatus)status
+                    snapshot:(FIRStorageTaskSnapshot *)snapshot {
+  [self fireHandlersForStatus:status snapshot:self.snapshot];
+  [self removeAllObservers];
+  self->_fetcherCompletion = nil;
+}
+
+- (BOOL)isContentToUploadValid:(NSError **)outError {
+  if (_uploadData != nil) {
+    return YES;
+  }
+
+  NSError *fileReachabilityError;
+  if (![_fileURL checkResourceIsReachableAndReturnError:&fileReachabilityError]) {
+    if (outError != NULL) {
+      NSString *description =
+          [NSString stringWithFormat:@"File at URL: %@ is not reachable.", _fileURL.absoluteString];
+      *outError = [NSError errorWithDomain:FIRStorageErrorDomain
+                                      code:FIRStorageErrorCodeUnknown
+                                  userInfo:@{
+                                    NSUnderlyingErrorKey : fileReachabilityError,
+                                    NSLocalizedDescriptionKey : description
+                                  }];
+    }
+
+    return NO;
+  }
+
+  return YES;
+}
+
 #pragma mark - Upload Management
 
 - (void)cancel {

Firestore/Source/Local/FSTLocalStore.mm

@@ -376,9 +376,10 @@ - (nullable FSTMutationBatch *)nextMutationBatchAfterBatchID:(BatchId)batchID {
 }
 
 - (nullable FSTMaybeDocument *)readDocument:(const DocumentKey &)key {
-  return self.persistence.run("ReadDocument", [&]() -> FSTMaybeDocument *_Nullable {
-    return [self.localDocuments documentForKey:key];
-  });
+  return self.persistence.run(
+      "ReadDocument", [&]() -> FSTMaybeDocument *_Nullable {
+        return [self.localDocuments documentForKey:key];
+      });
 }
 
 - (FSTQueryData *)allocateQuery:(FSTQuery *)query {

Firestore/core/src/firebase/firestore/model/field_value.cc

@@ -468,7 +468,8 @@ void FieldValue::SwitchTo(const Type type) {
     case Type::Object:
       object_value_.~unique_ptr<ObjectValue>();
       break;
-    default: {}  // The other types where there is nothing to worry about.
+    default: {
+    }  // The other types where there is nothing to worry about.
   }
   tag_ = type;
   // Must call constructor explicitly for any non-POD type to initialize.
@@ -506,7 +507,8 @@ void FieldValue::SwitchTo(const Type type) {
       new (&object_value_)
           std::unique_ptr<ObjectValue>(absl::make_unique<ObjectValue>());
       break;
-    default: {}  // The other types where there is nothing to worry about.
+    default: {
+    }  // The other types where there is nothing to worry about.
   }
 }