diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:19:52 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:19:52 +0000 |
| commit | 02ec798143ee3295b73c91593943748e8e835058 (patch) | |
| tree | 6e045565d5d0e67a14e292ddd300b82df377f89e /net | |
| parent | a4a89cfcd896832434ccf2d2502e3d06a91541d2 (diff) | |
| download | chromium_src-02ec798143ee3295b73c91593943748e8e835058.zip chromium_src-02ec798143ee3295b73c91593943748e8e835058.tar.gz chromium_src-02ec798143ee3295b73c91593943748e8e835058.tar.bz2 | |
Downgrade CHECK to DCHECK on buffer that doesn't fully decompress.
I don't have a reproduction case for hitting this.
BUG=75049
TEST=none
Review URL: http://codereview.chromium.org/6673083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/spdy/spdy_framer.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index b6f0901..1bca57d 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -1048,9 +1048,10 @@ SpdyFrame* SpdyFramer::DecompressFrameWithZStream(const SpdyFrame& frame, int decompressed_size = decompressed_max_size - decompressor->avail_out; new_frame->set_length(header_length + decompressed_size - SpdyFrame::size()); - // If there is data left, then we're in trouble. This API assumes everything - // was consumed. - CHECK_EQ(decompressor->avail_in, 0u); + // If there is data left, then the frame didn't fully decompress. This + // means that there is stranded data at the end of this frame buffer which + // will be ignored. + DCHECK_EQ(decompressor->avail_in, 0u); pre_decompress_bytes.Add(frame.length()); post_decompress_bytes.Add(new_frame->length()); |