2 files changed, 10 insertions, 6 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index c22b21f..a343151 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -916,8 +916,9 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
 
 int HttpNetworkTransaction::DoReadBody() {
   DCHECK(read_buf_);
-  DCHECK(read_buf_len_ > 0);
+  DCHECK_GT(read_buf_len_, 0);
   DCHECK(connection_.is_initialized());
+  DCHECK(!header_buf_->headers() || header_buf_body_offset_ >= 0);
 
   next_state_ = STATE_READ_BODY_COMPLETE;
 
@@ -1141,6 +1142,8 @@ void HttpNetworkTransaction::LogBlockedTunnelResponse(
 }
 
 int HttpNetworkTransaction::DidReadResponseHeaders() {
+  DCHECK_GE(header_buf_body_offset_, 0);
+
   scoped_refptr<HttpResponseHeaders> headers;
   if (has_found_status_line_start()) {
     headers = new HttpResponseHeaders(
@@ -1176,7 +1179,7 @@ int HttpNetworkTransaction::DidReadResponseHeaders() {
         request_headers_->headers_.clear();
         request_headers_bytes_sent_ = 0;
         header_buf_len_ = 0;
-        header_buf_body_offset_ = 0;
+        header_buf_body_offset_ = -1;
         establishing_tunnel_ = false;
         return OK;
 
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index bdb8e1b..9e6d53f 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -341,10 +341,11 @@ class HttpNetworkTransaction : public HttpTransaction {
   size_t request_headers_bytes_sent_;
   scoped_ptr<UploadDataStream> request_body_stream_;
 
-  // The read buffer may be larger than it is full.  The 'capacity' indicates
-  // the allocation size of the buffer, and the 'len' indicates how much data
-  // is in the buffer already.  The 'body offset' indicates the offset of the
-  // start of the response body within the read buffer.
+  // The read buffer |header_buf_| may be larger than it is full.  The
+  // 'capacity' indicates the allocation size of the buffer, and the 'len'
+  // indicates how much data is in the buffer already.  The 'body offset'
+  // indicates the offset of the start of the response body within the read
+  // buffer.
   scoped_refptr<ResponseHeaders> header_buf_;
   int header_buf_capacity_;
   int header_buf_len_;