Report unreadable files as size zero when uploading.

net/base/upload_data.cc

Index: net/base/upload_data.cc
diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc
index 04968736f1eebb5f634f10ab0a25528e0d808601..198b051fd9d4942cd310bb003e7160500dbbeb86 100644
--- a/net/base/upload_data.cc
+++ b/net/base/upload_data.cc
@@ -6,30 +6,42 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "net/base/net_errors.h"
 
 namespace net {
 
-uint64 UploadData::GetContentLength() const {
+uint64 UploadData::GetContentLength() {
   uint64 len = 0;
-  std::vector<Element>::const_iterator it = elements_.begin();
+  std::vector<Element>::iterator it = elements_.begin();
   for (; it != elements_.end(); ++it)
     len += (*it).GetContentLength();
   return len;
 }
 
-uint64 UploadData::Element::GetContentLength() const {
-  if (override_content_length_)
+uint64 UploadData::Element::GetContentLength() {
+  if (override_content_length_ || content_length_computed_)
     return content_length_;
 
   if (type_ == TYPE_BYTES)
     return static_cast<uint64>(bytes_.size());
 
-  DCHECK(type_ == TYPE_FILE);
+  DCHECK_EQ(TYPE_FILE, type_);
+  DCHECK(!file_stream_);
 
   // TODO(darin): This size calculation could be out of sync with the state of
   // the file when we get around to reading it.  We should probably find a way
   // to lock the file or somehow protect against this error condition.
 
+  content_length_computed_ = true;
+  content_length_ = 0;
+
+  // We need to open the file here to decide if we should report the file's
+  // size or zero.  We cache the open file, so that we can still read it when
+  // it comes time to.
+  file_stream_ = NewFileStreamForReading();
+  if (!file_stream_)
+    return 0;
+
   int64 length = 0;
   if (!file_util::GetFileSize(file_path_, &length))
     return 0;
@@ -38,7 +50,40 @@ uint64 UploadData::Element::GetContentLength() const {
     return 0;  // range is beyond eof
 
   // compensate for the offset and clip file_range_length_ to eof
-  return std::min(length - file_range_offset_, file_range_length_);
+  content_length_ =  std::min(length - file_range_offset_, file_range_length_);
+  return content_length_;
+}
+
+FileStream* UploadData::Element::NewFileStreamForReading() {
+  // In common usage GetContentLength() will call this first and store the
+  // result into |file_| and a subsequent call (from UploadDataStream) will
+  // get the cached open FileStream.
+  if (file_stream_) {
+    FileStream* file = file_stream_;
+    file_stream_ = NULL;
+    return file;
+  }
+
+  scoped_ptr<FileStream> file(new FileStream());
+  int64 rv = file->Open(file_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.
+    DLOG(WARNING) << "Failed to open \"" << file_path_.value()
+                  << "\" for reading: " << rv;
+    return NULL;
+  }
+  if (file_range_offset_) {
+    rv = file->Seek(FROM_BEGIN, file_range_offset_);
+    if (rv < 0) {
+      DLOG(WARNING) << "Failed to seek \"" << file_path_.value()
+                    << "\" to offset: " << file_range_offset_ << " (" << rv
+                    << ")";
+      return NULL;
+    }
+  }
+
+  return file.release();
 }
 
 }  // namespace net