Don't interpret embeded NULLs in a response header line as a line terminator.

net/http/http_util_unittest.cc

 // Copyright (c) 2006-2009 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 <algorithm>
 
 #include "base/basictypes.h"
 #include "net/http/http_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 177 matching lines @@
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     int input_len = static_cast<int>(strlen(tests[i].input));
     int eoh = HttpUtil::LocateEndOfHeaders(tests[i].input, input_len);
     EXPECT_EQ(tests[i].expected_result, eoh);
   }
 }
 
 TEST(HttpUtilTest, AssembleRawHeaders) {
   struct {
-    const char* input;
+    const char* input;  // with '|' representing \0

[wtc, 2011/09/12 18:48:09]

Nit: \0 => '\0'

[eroman, 2011/09/12 21:19:24]

Done.

     const char* expected_result;  // with '\0' changed to '|'
   } tests[] = {
     { "HTTP/1.0 200 OK\r\nFoo: 1\r\nBar: 2\r\n\r\n",
       "HTTP/1.0 200 OK|Foo: 1|Bar: 2||" },
 
     { "HTTP/1.0 200 OK\nFoo: 1\nBar: 2\n\n",
       "HTTP/1.0 200 OK|Foo: 1|Bar: 2||" },
 
     // Valid line continuation (single SP).
     {
@@ skipping 266 matching lines @@
       "   : 1\n"
       "  garbage\n"
       "Bar: 2\n\n",
 
       "HTTP/1.0 200 OK|"
       "   : 1|"
       "  garbage|"
       "Bar: 2||",
     },
 
+    // Embed NULLs in the status line. They should not be understood
+    // as line separators.
+    {
+      "HTTP/1.0 200 OK|Bar2:0|Baz2:1\r\nFoo: 1\r\nBar: 2\r\n\r\n",
+      "HTTP/1.0 200 OKBar2:0Baz2:1|Foo: 1|Bar: 2||"
+    },
+
+    // Embed NULLs in a header line. They should not be understood as
+    // line separators.
+    {
+      "HTTP/1.0 200 OK\nFoo: 1|Foo2: 3\nBar: 2\n\n",
+      "HTTP/1.0 200 OK|Foo: 1Foo2: 3|Bar: 2||"
+    },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
-    int input_len = static_cast<int>(strlen(tests[i].input));
-    std::string raw = HttpUtil::AssembleRawHeaders(tests[i].input, input_len);
+    std::string input = tests[i].input;
+    std::replace(input.begin(), input.end(), '|', '\0');
+    std::string raw = HttpUtil::AssembleRawHeaders(input.data(), input.size());
     std::replace(raw.begin(), raw.end(), '\0', '|');
-    EXPECT_TRUE(raw == tests[i].expected_result);
+    EXPECT_EQ(raw, tests[i].expected_result);

[wtc, 2011/09/12 18:48:09]

Nit: reverse the arguments of EXPECT_EQ?  I think the correct
order is (expected, actual).

[eroman, 2011/09/12 21:19:24]

Done.

   }
 }
 
 // Test SpecForRequest() and PathForRequest().
 TEST(HttpUtilTest, RequestUrlSanitize) {
   struct {
     const char* url;
     const char* expected_spec;
     const char* expected_path;
   } tests[] = {
@@ skipping 363 matching lines @@
 TEST(HttpUtilTest, NameValuePairsIteratorMissingEndQuote) {
   std::string data = "name='value";
   HttpUtil::NameValuePairsIterator parser(data.begin(), data.end(), ';');
   EXPECT_TRUE(parser.valid());
 
   ASSERT_NO_FATAL_FAILURE(
       CheckNextNameValuePair(&parser, true, true, "name", "value"));
   ASSERT_NO_FATAL_FAILURE(
       CheckNextNameValuePair(&parser, false, true, "", ""));
 }