diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2017-08-02 19:46:41 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-08-14 18:42:20 +0000 |
| commit | 9fbc06e6aa88372a449b75b35420e83ffce05a0b (patch) | |
| tree | 34876c9dc982dcd68a8c3233b91da2d461797c3d /src/encoding/csv | |
| parent | f9cf8e5ab11c7ea3f1b9fde302c0a325df020b1a (diff) | |
| download | go-9fbc06e6aa88372a449b75b35420e83ffce05a0b.tar.gz go-9fbc06e6aa88372a449b75b35420e83ffce05a0b.zip | |
encoding/csv: preserve \r\n in quoted fields
The parser mistakenly assumed it could always fold \r\n into \n, which
is not true since a \r\n inside a quoted fields has no special meaning
and should be kept as is.
Fix this by not folding \r\n to \n inside quotes fields.
Fixes #21201
Change-Id: Ifebc302e49cf63e0a027ee90f088dbc050a2b7a6
Reviewed-on: https://go-review.googlesource.com/52810
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/encoding/csv')
| -rw-r--r-- | src/encoding/csv/reader.go | 11 | ||||
| -rw-r--r-- | src/encoding/csv/reader_test.go | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/encoding/csv/reader.go b/src/encoding/csv/reader.go index 4085321a71..e49240fb53 100644 --- a/src/encoding/csv/reader.go +++ b/src/encoding/csv/reader.go @@ -233,6 +233,13 @@ func (r *Reader) readRune() (rune, error) { return r1, err } +// readRawRune works the same way as readRune, but does not fold \r\n to \n. +func (r *Reader) readRawRune() (rune, error) { + r1, _, err := r.r.ReadRune() + r.column++ + return r1, err +} + // skip reads runes up to and including the rune delim or until error. func (r *Reader) skip(delim rune) error { for { @@ -351,7 +358,9 @@ func (r *Reader) parseField() (haveField bool, delim rune, err error) { // quoted field Quoted: for { - r1, err = r.readRune() + // use readRawRune instead of readRune to preserve \r\n + // in quotes fields. + r1, err = r.readRawRune() if err != nil { if err == io.EOF { if r.LazyQuotes { diff --git a/src/encoding/csv/reader_test.go b/src/encoding/csv/reader_test.go index 76e94bab3e..3811629aad 100644 --- a/src/encoding/csv/reader_test.go +++ b/src/encoding/csv/reader_test.go @@ -284,6 +284,13 @@ x,,, Line: 2, Column: 2, }, + { // issue 21201 + Name: "CRLFInQuotedField", + Input: "\"Hello\r\nHi\"", + Output: [][]string{ + {"Hello\r\nHi"}, + }, + }, } func TestRead(t *testing.T) { |