Use the correct remaining data length when parsing chunk headers.

BUG=124853
TEST=SafeBrowsingProtocolParsingTest.TestTruncatedHeader


Review URL: http://codereview.chromium.org/10216006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133867 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/safe_browsing/protocol_parser.cc

@@ -199,7 +199,7 @@ bool SafeBrowsingProtocolParser::ParseChunk(const std::string& list_name,
 
   while (remaining > 0) {
     std::string cmd_line;
-    if (!GetLine(chunk_data, length, &cmd_line))
+    if (!GetLine(chunk_data, remaining, &cmd_line))
       return false;  // Error: bad chunk format!
 
     const int line_len = static_cast<int>(cmd_line.length()) + 1;

chrome/browser/safe_browsing/protocol_parser_unittest.cc

@@ -223,6 +223,21 @@ TEST(SafeBrowsingProtocolParsingTest, TestTruncatedUrlHashChunk) {
   EXPECT_EQ(chunks.size(), 0U);
 }
 
+// Test to verify handling of a truncated chunk header.
+TEST(SafeBrowsingProtocolParsingTest, TestTruncatedHeader) {
+  std::string truncated_chunks("a:1:4:0\na:");
+
+  // Run the parser.
+  SafeBrowsingProtocolParser parser;
+  SBChunkList chunks;
+  bool result = parser.ParseChunk(
+      safe_browsing_util::kMalwareList,
+      truncated_chunks.data(),
+      static_cast<int>(truncated_chunks.length()),
+      &chunks);
+  EXPECT_FALSE(result);
+}
+
 // Test parsing one sub chunk.
 TEST(SafeBrowsingProtocolParsingTest, TestSubChunk) {
   std::string sub_chunk("s:9:4:59\naaaaxkkkk1111\003"