Recognize "\r\n" line endings in base::JSONParser to report correct line numbers in errors

base/json/json_parser.cc

 // Copyright (c) 2012 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 "base/json/json_parser.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 386 matching lines @@
       return T_INVALID_TOKEN;
   }
 }
 
 void JSONParser::EatWhitespaceAndComments() {
   while (pos_ < end_pos_) {
     switch (*pos_) {
       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':
         NextChar();
         break;
       case '/':
         if (!EatComment())
           return;
         break;
       default:
@@ skipping 535 matching lines @@
                                            const std::string& description) {
   if (line || column) {
     return StringPrintf("Line: %i, column: %i, %s",
         line, column, description.c_str());
   }
   return description;
 }
 
 }  // namespace internal
 }  // namespace base