Handle out of memory in GrowableIOBuffer more gracefully.

BUG=25826
TEST=none

Review URL: http://codereview.chromium.org/338049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30287 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 5 deletions

diff --git a/net/base/io_buffer.cc b/net/base/io_buffer.cc
index d348f37..9ae2746 100644
--- a/net/base/io_buffer.cc
+++ b/net/base/io_buffer.cc
@@ -19,15 +19,20 @@ void DrainableIOBuffer::SetOffset(int bytes) {
   data_ = base_->data() + used_;
 }
 
-void GrowableIOBuffer::set_capacity(int capacity) {
+bool GrowableIOBuffer::SetCapacity(int capacity) {
   DCHECK_GE(capacity, 0);
-  real_data_.reset(static_cast<char*>(realloc(real_data_.release(), capacity)));
+  char* cur_buf = real_data_.release();
+  real_data_.reset(static_cast<char*>(realloc(cur_buf, capacity)));
+  if (real_data_.get() == NULL && capacity != 0) {
+    real_data_.reset(cur_buf);
+    return false;
+  }
   capacity_ = capacity;
-  CHECK(real_data_.get() != NULL || capacity == 0);
   if (offset_ > capacity)
     set_offset(capacity);
   else
     set_offset(offset_);  // The pointer may have changed.
+  return true;
 }
 
 void GrowableIOBuffer::set_offset(int offset) {
diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h
index eaf3a39..e301df8 100644
--- a/net/base/io_buffer.h
+++ b/net/base/io_buffer.h
@@ -106,12 +106,14 @@ class GrowableIOBuffer : public IOBuffer {
   GrowableIOBuffer() : IOBuffer(), capacity_(0), offset_(0) {}
   ~GrowableIOBuffer() { data_ = NULL; }
 
+  // realloc memory to the specified capacity.  Returns true on success.
+  // On failure, the capacity and buffer are unchanged.
+  bool SetCapacity(int capacity);
   int capacity() { return capacity_; }
-  void set_capacity(int capacity);
 
   // |offset| moves the |data_| pointer, allowing "seeking" in the data.
-  int offset() { return offset_; }
   void set_offset(int offset);
+  int offset() { return offset_; }
 
   int RemainingCapacity() { return capacity_ - offset_; }
   char* StartOfBuffer() { return real_data_.get(); }