base/json/json_parser.cc - Issue 12026035: Recognize "\r\n" line endings in base::JSONParser to report correct line numbers in errors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/json/json_parser.cc

Issue 12026035: Recognize "\r\n" line endings in base::JSONParser to report correct line numbers in errors (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: base/json/json_parser.cc

===================================================================

--- base/json/json_parser.cc (revision 177738)

+++ base/json/json_parser.cc (working copy)

@@ -404,7 +404,9 @@

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') )

Robert Sesek 2013/01/22 18:38:01 nit: no spaces around the condition of an if Also

+ ++line_number_;

// Fall through.

case ' ':

case '\t':

« no previous file with comments | « AUTHORS ('k') | base/json/json_parser_unittest.cc » ('j') | no next file with comments »