| Index: net/spdy/fuzzing/hpack_fuzz_util_test.cc
|
| diff --git a/net/spdy/fuzzing/hpack_fuzz_util_test.cc b/net/spdy/fuzzing/hpack_fuzz_util_test.cc
|
| index ebf400ce999bd6c17b60ff8656959def8ee82b01..8d9ef49313af53f60aad0b79f5447b9e6c6c5a72 100644
|
| --- a/net/spdy/fuzzing/hpack_fuzz_util_test.cc
|
| +++ b/net/spdy/fuzzing/hpack_fuzz_util_test.cc
|
| @@ -52,13 +52,20 @@ TEST(HpackFuzzUtilTest, SampleExponentialRegression) {
|
|
|
| TEST(HpackFuzzUtilTest, ParsesSequenceOfHeaderBlocks) {
|
| char fixture[] =
|
| - "\x00\x00\x00\x05""aaaaa"
|
| - "\x00\x00\x00\x04""bbbb"
|
| - "\x00\x00\x00\x03""ccc"
|
| - "\x00\x00\x00\x02""dd"
|
| - "\x00\x00\x00\x01""e"
|
| - "\x00\x00\x00\x00"""
|
| - "\x00\x00\x00\x03""fin";
|
| + "\x00\x00\x00\x05"
|
| + "aaaaa"
|
| + "\x00\x00\x00\x04"
|
| + "bbbb"
|
| + "\x00\x00\x00\x03"
|
| + "ccc"
|
| + "\x00\x00\x00\x02"
|
| + "dd"
|
| + "\x00\x00\x00\x01"
|
| + "e"
|
| + "\x00\x00\x00\x00"
|
| + ""
|
| + "\x00\x00\x00\x03"
|
| + "fin";
|
|
|
| HpackFuzzUtil::Input input;
|
| input.input.assign(fixture, arraysize(fixture) - 1);
|
| @@ -98,8 +105,7 @@ TEST(HpackFuzzUtilTest, PassValidInputThroughAllStages) {
|
| HpackFuzzUtil::InitializeFuzzerContext(&context);
|
|
|
| EXPECT_TRUE(HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(
|
| - &context,
|
| - StringPiece(input, arraysize(input) - 1)));
|
| + &context, StringPiece(input, arraysize(input) - 1)));
|
|
|
| std::map<string, string> expect;
|
| expect[":method"] = "GET";
|
| @@ -115,12 +121,12 @@ TEST(HpackFuzzUtilTest, ValidFuzzExamplesRegressionTest) {
|
|
|
| // Load the example fixtures versioned with the source tree.
|
| HpackFuzzUtil::Input input;
|
| - ASSERT_TRUE(base::ReadFileToString(
|
| - source_root.Append(FILE_PATH_LITERAL("net"))
|
| - .Append(FILE_PATH_LITERAL("data"))
|
| - .Append(FILE_PATH_LITERAL("spdy_tests"))
|
| - .Append(FILE_PATH_LITERAL("examples.hpack")),
|
| - &input.input));
|
| + ASSERT_TRUE(
|
| + base::ReadFileToString(source_root.Append(FILE_PATH_LITERAL("net"))
|
| + .Append(FILE_PATH_LITERAL("data"))
|
| + .Append(FILE_PATH_LITERAL("spdy_tests"))
|
| + .Append(FILE_PATH_LITERAL("examples.hpack")),
|
| + &input.input));
|
|
|
| HpackFuzzUtil::FuzzerContext context;
|
| HpackFuzzUtil::InitializeFuzzerContext(&context);
|
| @@ -128,8 +134,8 @@ TEST(HpackFuzzUtilTest, ValidFuzzExamplesRegressionTest) {
|
| StringPiece block;
|
| while (HpackFuzzUtil::NextHeaderBlock(&input, &block)) {
|
| // As these are valid examples, all fuzz stages should succeed.
|
| - EXPECT_TRUE(HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(
|
| - &context, block));
|
| + EXPECT_TRUE(
|
| + HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(&context, block));
|
| }
|
| }
|
|
|
| @@ -138,9 +144,8 @@ TEST(HpackFuzzUtilTest, FlipBitsMutatesBuffer) {
|
| string unmodified(buffer, arraysize(buffer) - 1);
|
|
|
| EXPECT_EQ(unmodified, buffer);
|
| - HpackFuzzUtil::FlipBits(reinterpret_cast<uint8*>(buffer),
|
| - arraysize(buffer) - 1,
|
| - 1);
|
| + HpackFuzzUtil::FlipBits(
|
| + reinterpret_cast<uint8*>(buffer), arraysize(buffer) - 1, 1);
|
| EXPECT_NE(unmodified, buffer);
|
| }
|
|
|
|
|