[Net] Fix error handling on wrong file in UploadData

net/base/upload_file_element_reader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_file_element_reader.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/task_runner_util.h"
@@ skipping 10 matching lines @@
 uint64 overriding_content_length = 0;
 
 // This function is used to implement Init().
 template<typename FileStreamDeleter>
 int InitInternal(const base::FilePath& path,
                  uint64 range_offset,
                  uint64 range_length,
                  const base::Time& expected_modification_time,
                  scoped_ptr<FileStream, FileStreamDeleter>* out_file_stream,
                  uint64* out_content_length) {
+  out_file_stream->reset();
+  *out_content_length = 0;
+
   scoped_ptr<FileStream> file_stream(new FileStream(NULL));
   int64 rv = file_stream->OpenSync(
       path, base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ);
   if (rv != OK) {
-    // If the file can't be opened, we'll just upload an empty file.
+    // If the file can't be opened, the upload should fail.
     DLOG(WARNING) << "Failed to open \"" << path.value()
                   << "\" for reading: " << rv;
-    file_stream.reset();
+    return rv;
   } else if (range_offset) {
     rv = file_stream->SeekSync(FROM_BEGIN, range_offset);
     if (rv < 0) {
       DLOG(WARNING) << "Failed to seek \"" << path.value()
                     << "\" to offset: " << range_offset << " (" << rv << ")";
-      file_stream.reset();
+      return rv;
     }
   }
 
   int64 length = 0;
-  if (file_stream.get() &&
-      file_util::GetFileSize(path, &length) &&
-      range_offset < static_cast<uint64>(length)) {
+  if (!file_util::GetFileSize(path, &length)) {
+    DLOG(WARNING) << "Failed to get file size of \"" << path.value() << "\"";
+    return ERR_FILE_NOT_FOUND;
+  }
+
+  if (range_offset < static_cast<uint64>(length)) {
     // Compensate for the offset.
     length = std::min(length - range_offset, range_length);
   }
   *out_content_length = length;
   out_file_stream->reset(file_stream.release());
 
   // If the underlying file has been changed and the expected file modification
   // time is set, treat it as error. Note that the expected modification time
   // from WebKit is based on time_t precision. So we have to convert both to
   // time_t to compare. This check is used for sliced files.
   if (!expected_modification_time.is_null()) {
     base::PlatformFileInfo info;
-    if (file_util::GetFileInfo(path, &info) &&
-        expected_modification_time.ToTimeT() != info.last_modified.ToTimeT()) {
+    if (file_util::GetFileInfo(path, &info)) {
+      DLOG(WARNING) << "Failed to get file info of \"" << path.value() << "\"";
+      return ERR_FILE_NOT_FOUND;

[mmenke, 2013/10/29 15:29:31]

I suggest not setting out_content_length or out_file_stream when we return
either of these errors - I prefer to have the invariant "We either set them to
be non-NULL, or return an error".

[tzik, 2013/11/07 04:42:55]

Done.

+    }
+
+    if (expected_modification_time.ToTimeT() != info.last_modified.ToTimeT()) {
       return ERR_UPLOAD_FILE_CHANGED;
     }
   }
 
   return OK;
 }
 
 // This function is used to implement Read().
 int ReadInternal(scoped_refptr<IOBuffer> buf,
                  int buf_length,
@@ skipping 205 matching lines @@
   const int result = ReadInternal(buf, buf_length, BytesRemaining(),
                                   file_stream_.get());
   if (result > 0) {
     DCHECK_GE(bytes_remaining_, static_cast<uint64>(result));
     bytes_remaining_ -= result;
   }
   return result;
 }
 
 }  // namespace net