Fix bug in deflate code.

net/filter/gzip_source_stream.h

 // Copyright 2016 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.
 
 #ifndef NET_FILTER_GZIP_SOURCE_STREAM_H_
 #define NET_FILTER_GZIP_SOURCE_STREAM_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 26 matching lines @@
       std::unique_ptr<SourceStream> previous,
       SourceStream::SourceType type);
 
  private:
   enum InputState {
     // Starts processing the input stream. Checks whether the stream is valid
     // and whether a fallback to plain data is needed.
     STATE_START,
     // Gzip header of the input stream is being processed.
     STATE_GZIP_HEADER,
+    // Deflate responses may or may not have a zlib header. In this state until

[xunjieli, 2017/01/03 16:21:17]

For future reference, could you add a link to bug 677001?

[mmenke, 2017/01/03 18:25:42]

SGTM, Done.

+    // enough has been inflated that this stream most likely has a zlib header,
+    // or until a zlib header has been added. Data is appended to |replay_data_|
+    // in case it needs to be replayed after adding a header.
+    STATE_SNIFFING_DEFLATE_HEADER,
+    // If a zlib header has to be added to the response, this state will replay
+    // data passed to inflate before it was determined that no zlib header was
+    // present.
+    STATE_REPLAY_DATA,
     // The input stream is being decoded.
     STATE_COMPRESSED_BODY,
     // Gzip footer of the input stream is being processed.
     STATE_GZIP_FOOTER,
     // The input stream is being passed through undecoded.
     STATE_UNCOMPRESSED_BODY,
   };
 
   GzipSourceStream(std::unique_ptr<SourceStream> previous,
                    SourceStream::SourceType type);
@@ skipping 20 matching lines @@
   // Returns whether this stream looks like it could be plain text (ie, not
   // actually gzipped). Right now this uses an extremely simple heuristic; see
   // the source for details. This method checks the first byte of the stream.
   bool ShouldFallbackToPlain(char first_byte);
 
   // The control block of zlib which actually does the decoding.
   // This data structure is initialized by Init and updated only by
   // FilterData(), with InsertZlibHeader() being the exception as a workaround.
   std::unique_ptr<z_stream> zlib_stream_;
 
-  // A flag used by FilterData() to record whether we've successfully added
-  // a zlib header to this stream.
-  bool zlib_header_added_;
+  // While in STATE_SNIFFING_DEFLATE_HEADER, it may be determined that a zlib
+  // header needs to be added, and all received data needs to be replayed. In
+  // that case, this buffer holds the data to be replayed.
+  std::string replay_data_;
 
   // Used to parse the gzip header in gzip stream.
   // It is used when the decoding mode is GZIP_SOURCE_STREAM_GZIP.
   GZipHeader gzip_header_;
 
   // Tracks how many bytes of gzip footer are yet to be filtered.
   size_t gzip_footer_bytes_left_;
 
   // Tracks the state of the input stream.
   InputState input_state_;
 
+  // Used when replaying data.
+  InputState replay_state_;
+
   DISALLOW_COPY_AND_ASSIGN(GzipSourceStream);
 };
 
 }  // namespace net
 
 #endif  // NET_FILTER_GZIP_SOURCE_STREAM_H__