Land Recent QUIC Changes

net/quic/quic_data_writer.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.
 
 #include "net/quic/quic_data_writer.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
@@ skipping 91 matching lines @@
   DCHECK_LE(length_, capacity_);
   if (length_ > capacity_) {
     return;
   }
   memset(buffer_ + length_, 0x00, capacity_ - length_);
   length_ = capacity_;
 }
 
 bool QuicDataWriter::WriteUInt8ToOffset(uint8 value, size_t offset) {
   DCHECK_LT(offset, capacity_);
-  int latched_length = length_;
+  size_t latched_length = length_;
   length_ = offset;
   bool success = WriteUInt8(value);
+  DCHECK_LE(length_, latched_length);
+  length_ = latched_length;
+  return success;
+}
+
+bool QuicDataWriter::WriteUInt32ToOffset(uint32 value, size_t offset) {
+  DCHECK_LT(offset, capacity_);
+  size_t latched_length = length_;
+  length_ = offset;
+  bool success = WriteUInt32(value);
+  DCHECK_LE(length_, latched_length);
   length_ = latched_length;
   return success;
 }
 
 bool QuicDataWriter::WriteUInt48ToOffset(uint64 value, size_t offset) {
   DCHECK_LT(offset, capacity_);
-  int latched_length = length_;
+  size_t latched_length = length_;
   length_ = offset;
   bool success = WriteUInt48(value);
+  DCHECK_LE(length_, latched_length);
   length_ = latched_length;
   return success;
 }
 
 }  // namespace net