Handle Z_BUF_ERROR as a non-fatal error while incrementally decompressing

net/spdy/spdy_framer.cc

 // Copyright (c) 2012 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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 1508 matching lines @@
   char buffer[kHeaderDataChunkMaxSize];
 
   decomp->next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
   decomp->avail_in = len;
   const SpdyStreamId stream_id = GetControlFrameStreamId(control_frame);
   DCHECK_LT(0u, stream_id);
   while (decomp->avail_in > 0 && processed_successfully) {
     decomp->next_out = reinterpret_cast<Bytef*>(buffer);
     decomp->avail_out = arraysize(buffer);
     int rv = DecompressHeaderBlockInZStream(decomp);
-    if (rv != Z_OK) {
+    if (rv != Z_OK && rv != Z_BUF_ERROR) {

[wtc, 2012/01/12 23:49:38]

Z_BUF_ERROR means "no progress is possible".  With that
knowledge, we may be able to do something simpler.

[ramant (doing other things), 2012/01/13 00:14:58]

Wan-Teh and I had stepped through the code and we are satisfied with the fix. It
exits the function because decomp->avail_in is zero.

Will discuss with server group if we could rearrange this code so that it is
more readable.

Done.

       set_error(SPDY_DECOMPRESS_FAILURE);
       DLOG(WARNING) << "inflate failure: " << rv;
       processed_successfully = false;
     } else {
       size_t decompressed_len = arraysize(buffer) - decomp->avail_out;
       if (decompressed_len > 0) {
         processed_successfully = visitor_->OnControlFrameHeaderData(
             control_frame, buffer, decompressed_len);
       }
       if (!processed_successfully) {
@@ skipping 178 matching lines @@
 
 void SpdyFramer::set_enable_compression_default(bool value) {
   compression_default_ = value;
 }
 
 void SpdyFramer::set_validate_control_frame_sizes(bool value) {
   validate_control_frame_sizes_ = value;
 }
 
 }  // namespace spdy