Fix a bug in QUIC's SpdyUtils where Content-Length was being parsed as an int, not an int64, causin…

net/quic/spdy_utils_test.cc

 // 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.
 #include "net/quic/spdy_utils.h"
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "net/test/gtest_util.h"
 
 using base::StringPiece;
 using std::string;
 using testing::UnorderedElementsAre;
 using testing::Pair;
 
 namespace net {
 namespace test {
 
 TEST(SpdyUtilsTest, SerializeAndParseHeaders) {
   // Creates a SpdyHeaderBlock with some key->value pairs, serializes it, then
   // parses the serialized output and verifies that the end result is the same
   // as the headers that the test started with.
 
   SpdyHeaderBlock input_headers;
   input_headers[":pseudo1"] = "pseudo value1";
   input_headers[":pseudo2"] = "pseudo value2";
   input_headers["key1"] = "value1";
-  const int kContentLength = 1234;
-  input_headers["content-length"] = base::IntToString(kContentLength);
+  const int64_t kContentLength = 1234;
+  input_headers["content-length"] = base::Int64ToString(kContentLength);
   input_headers["key2"] = "value2";
 
   // Serialize the header block.
+  string serialized_headers =
+      SpdyUtils::SerializeUncompressedHeaders(input_headers);
+
+  // Take the serialized header block, and parse back into SpdyHeaderBlock.
+  SpdyHeaderBlock output_headers;
+  int64_t content_length = -1;
+  ASSERT_TRUE(SpdyUtils::ParseHeaders(serialized_headers.data(),
+                                      serialized_headers.size(),
+                                      &content_length, &output_headers));
+
+  // Should be back to the original headers.
+  EXPECT_EQ(content_length, kContentLength);
+  EXPECT_EQ(output_headers, input_headers);
+}
+
+TEST(SpdyUtilsTest, SerializeAndParseHeadersLargeContentLength) {
+  // Creates a SpdyHeaderBlock with some key->value pairs, serializes it, then
+  // parses the serialized output and verifies that the end result is the same
+  // as the headers that the test started with.
+
+  SpdyHeaderBlock input_headers;
+  input_headers[":pseudo1"] = "pseudo value1";
+  input_headers[":pseudo2"] = "pseudo value2";
+  input_headers["key1"] = "value1";
+  const int64_t kContentLength = 12345678900;
+  input_headers["content-length"] = base::Int64ToString(kContentLength);
+  input_headers["key2"] = "value2";
+
+  // Serialize the header block.
   string serialized_headers =
       SpdyUtils::SerializeUncompressedHeaders(input_headers);
 
   // Take the serialized header block, and parse back into SpdyHeaderBlock.
   SpdyHeaderBlock output_headers;
   int64_t content_length = -1;
   ASSERT_TRUE(SpdyUtils::ParseHeaders(serialized_headers.data(),
                                       serialized_headers.size(),
                                       &content_length, &output_headers));
 
@@ skipping 262 matching lines @@
   headers[":scheme"] = "https";
   EXPECT_FALSE(SpdyUtils::UrlIsValid(headers));
   headers[":authority"] = "www.google.com";
   EXPECT_FALSE(SpdyUtils::UrlIsValid(headers));
   headers[":path"] = "/index.html";
   EXPECT_TRUE(SpdyUtils::UrlIsValid(headers));
 }
 
 }  // namespace test
 }  // namespace net