From ab89378cb73003058d1f9707535610af468752fc Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Wed, 3 Jun 2015 16:04:01 -0700 Subject: encoding/csv: skip blank lines when FieldsPerRecord >= 0 Fixes #11050. Change-Id: Ie5d16960a1f829af947d82a63fe414924cd02ff6 Reviewed-on: https://go-review.googlesource.com/10666 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick --- src/encoding/csv/reader.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/encoding/csv/reader.go') diff --git a/src/encoding/csv/reader.go b/src/encoding/csv/reader.go index ca81a41242..37bf80ceae 100644 --- a/src/encoding/csv/reader.go +++ b/src/encoding/csv/reader.go @@ -228,16 +228,15 @@ func (r *Reader) parseRecord() (fields []string, err error) { } r.r.UnreadRune() - // If FieldsPerRecord is greater then 0 we can assume the final - // length of fields to be equal to FieldsPerRecord. - if r.FieldsPerRecord > 0 { - fields = make([]string, 0, r.FieldsPerRecord) - } - // At this point we have at least one field. for { haveField, delim, err := r.parseField() if haveField { + // If FieldsPerRecord is greater then 0 we can assume the final + // length of fields to be equal to FieldsPerRecord. + if r.FieldsPerRecord > 0 && fields == nil { + fields = make([]string, 0, r.FieldsPerRecord) + } fields = append(fields, r.field.String()) } if delim == '\n' || err == io.EOF { -- cgit v1.3