Add chunked uploads support to SPDY

net/base/upload_data_stream.cc

 // Copyright (c) 2010 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_data_stream.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
@@ skipping 51 matching lines @@
     UploadData::Element& element = elements[next_element_];
 
     size_t size_remaining = kBufSize - buf_len_;
     if (element.type() == UploadData::TYPE_BYTES ||
         element.type() == UploadData::TYPE_CHUNK) {
       const std::vector<char>& d = element.bytes();
       size_t count = d.size() - next_element_offset_;
 
       size_t bytes_copied = std::min(count, size_remaining);
 
-      memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied);
-      buf_len_ += bytes_copied;
+      // Check if we have anything to copy first, because we are getting the
+      // address of an element in |d| and that will throw an exception if |d|
+      // is an empty vector.
+      if (bytes_copied) {
+        memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied);
+        buf_len_ += bytes_copied;
+      }
 
       if (bytes_copied == count) {
         advance_to_next_element = true;
       } else {
         next_element_offset_ += bytes_copied;
       }
     } else {
       DCHECK(element.type() == UploadData::TYPE_FILE);
 
       if (!next_element_remaining_) {
@@ skipping 47 matching lines @@
   if (next_element_ == elements.size() && !buf_len_) {
     if (!data_->is_chunked() ||
         (!elements.empty() && elements.back().is_last_chunk())) {
       eof_ = true;
     }
   }
 
   return OK;
 }
 
+bool UploadDataStream::peek_end_of_chunks() const {

[willchan no longer on Chromium, 2011/03/03 19:47:48]

This is not a trivial accessor. Also, this may be better named as
IsOnLastChunk().

+  std::vector<UploadData::Element>& elements = *data_->elements();

[willchan no longer on Chromium, 2011/03/03 19:47:48]

Can you get away with a const reference?

+  if (!data_->is_chunked())

[willchan no longer on Chromium, 2011/03/03 19:47:48]

If this doesn't depend on |elements|, then how about moving it above?

But should this ever be called in the non-chunked control path? Perhaps we
should have a DCHECK(data_->is_chunked()); I don't understand what
"peek_end_of_chunks()" means for a non-chunked UploadDataStream. Rather than
forcing weird semantics on the function, I think it's best to disallow it being
called. Callers should know they're dealing with chunked UploadDataStreams, or
they should check is_chunked().

+    return false;
+  return (eof_ ||
+          (!elements.empty() &&
+           next_element_ >= elements.size() - 1 &&

[willchan no longer on Chromium, 2011/03/03 19:47:48]

I find |next_element_ > elements.size()| more readable since you don't need the
- 1.

[Satish, 2011/03/03 22:21:44]

The condition could only be changed as "next_element_ > elements.size() - 2",
not as "next_element_ > elements.size()". So leaving as is.

[willchan no longer on Chromium, 2011/03/03 22:26:54]

Oops, missed that! Bleh, off by one =/

+           elements.back().is_last_chunk()));
+}
+
 }  // namespace net