diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | base/json/json_parser.cc | 4 | ||||
| -rw-r--r-- | base/json/json_parser_unittest.cc | 17 |
3 files changed, 19 insertions, 3 deletions
@@ -220,3 +220,4 @@ Trevor Perrin <unsafe@trevp.net> Ion Rosca <rosca@adobe.com> Sylvain Zimmer <sylvinus@gmail.com> Sungmann Cho <sungmann.cho@gmail.com> +方觉 (Fang Jue) <fangjue23303@gmail.com> diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc index 4c03a98..429c77a 100644 --- a/base/json/json_parser.cc +++ b/base/json/json_parser.cc @@ -404,7 +404,9 @@ void JSONParser::EatWhitespaceAndComments() { case '\r': case '\n': index_last_line_ = index_; - ++line_number_; + // Don't increment line_number_ twice for "\r\n". + if (!(*pos_ == '\n' && pos_ > start_pos_ && *(pos_ - 1) == '\r')) + ++line_number_; // Fall through. case ' ': case '\t': diff --git a/base/json/json_parser_unittest.cc b/base/json/json_parser_unittest.cc index 8ee886b..74e2026 100644 --- a/base/json/json_parser_unittest.cc +++ b/base/json/json_parser_unittest.cc @@ -210,8 +210,8 @@ TEST_F(JSONParserTest, ErrorMessages) { EXPECT_EQ(0, error_code); // Test line and column counting - const char* big_json = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]"; - // error here ---------------------------------^ + const char big_json[] = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]"; + // error here ----------------------------------^ root.reset(JSONReader::ReadAndReturnError(big_json, JSON_PARSE_RFC, &error_code, &error_message)); EXPECT_FALSE(root.get()); @@ -219,6 +219,19 @@ TEST_F(JSONParserTest, ErrorMessages) { error_message); EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code); + error_code = 0; + error_message = ""; + // Test line and column counting with "\r\n" line ending + const char big_json_crlf[] = + "[\r\n0,\r\n1,\r\n2,\r\n3,4,5,6 7,\r\n8,\r\n9\r\n]"; + // error here ----------------------^ + root.reset(JSONReader::ReadAndReturnError(big_json_crlf, JSON_PARSE_RFC, + &error_code, &error_message)); + EXPECT_FALSE(root.get()); + EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError), + error_message); + EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code); + // Test each of the error conditions root.reset(JSONReader::ReadAndReturnError("{},{}", JSON_PARSE_RFC, &error_code, &error_message)); |