Land Recent QUIC changes.

net/quic/quic_spdy_decompressor.cc

 // Copyright (c) 2013 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.
 
 #include "net/quic/quic_spdy_decompressor.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
@@ skipping 57 matching lines @@
 };
 
 bool SpdyFramerVisitor::OnControlFrameHeaderData(SpdyStreamId stream_id,
                                                  const char* header_data,
                                                  size_t len) {
   DCHECK(visitor_);
   return visitor_->OnDecompressedData(StringPiece(header_data, len));
 }
 
 QuicSpdyDecompressor::QuicSpdyDecompressor()
-    : spdy_framer_(3),
+    : spdy_framer_(kSpdyVersion3),
       spdy_visitor_(new SpdyFramerVisitor(NULL)),
       current_header_id_(1),
       has_current_compressed_size_(false),
       current_compressed_size_(0),
       compressed_bytes_consumed_(0) {
   spdy_framer_.set_visitor(spdy_visitor_.get());
 }
 
 QuicSpdyDecompressor::~QuicSpdyDecompressor() {
 }
@@ skipping 20 matching lines @@
     compressed_size_buffer_.clear();
     has_current_compressed_size_ = true;
     data = data.substr(missing_size);
     compressed_bytes_consumed_ = 0;
   }
 
   size_t bytes_to_consume =
       min(current_compressed_size_ - compressed_bytes_consumed_,
           static_cast<uint32>(data.length()));
   if (bytes_to_consume > 0) {
-    bool success = spdy_framer_.IncrementallyDecompressControlFrameHeaderData(
-        current_header_id_, data.data(), bytes_to_consume);
-    DCHECK(success);
+    if (!spdy_framer_.IncrementallyDecompressControlFrameHeaderData(
+            current_header_id_, data.data(), bytes_to_consume)) {
+      visitor->OnDecompressionError();
+      return bytes_consumed;
+    }
     compressed_bytes_consumed_ += bytes_to_consume;
     bytes_consumed += bytes_to_consume;
   }
   if (current_compressed_size_ - compressed_bytes_consumed_ == 0) {
     ResetForNextHeaders();
   }
   return bytes_consumed;
 }
 
 void QuicSpdyDecompressor::ResetForNextHeaders() {
   has_current_compressed_size_ = false;
   current_compressed_size_ = 0;
   compressed_bytes_consumed_ = 0;
   ++current_header_id_;
 }
 
 }  // namespace net