summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorcdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 21:28:22 +0000
committercdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 21:28:22 +0000
commite240e9fdd8f3b5b9bc216c064185d1887f6aa1a5 (patch)
treef2652c43dd415eb9335bd9997faed4d9a2222d0c /net
parent9d9715a7d045e052061fe8750d198d378befe99e (diff)
downloadchromium_src-e240e9fdd8f3b5b9bc216c064185d1887f6aa1a5.zip
chromium_src-e240e9fdd8f3b5b9bc216c064185d1887f6aa1a5.tar.gz
chromium_src-e240e9fdd8f3b5b9bc216c064185d1887f6aa1a5.tar.bz2
Revision 59384 was incorrect and did not properly perform the check. This fixes it.
BUG=55119 TEST=None Review URL: http://codereview.chromium.org/3452004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/spdy/spdy_framer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 248aa93..50682a8 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -424,7 +424,7 @@ size_t SpdyFramer::ProcessDataFramePayload(const char* data, size_t len) {
void SpdyFramer::ExpandControlFrameBuffer(size_t size) {
size_t alloc_size = size + SpdyFrame::size();
DCHECK_LT(alloc_size, kControlFrameBufferMaxSize);
- if (size <= current_frame_capacity_)
+ if (alloc_size <= current_frame_capacity_)
return;
char* new_buffer = new char[alloc_size];
memcpy(new_buffer, current_frame_buffer_, current_frame_len_);