diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-05 22:50:24 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-05 22:50:24 -0500 |
| commit | 2d0db8e591513a1123057b8c330c946ddcb4fbc8 (patch) | |
| tree | 887fa345faf178b4666ec567a3ed8129f54a1ed2 /src/bufio/scan.go | |
| parent | 67742ef560be186a2ebeb45aaab50399bf81b358 (diff) | |
| download | go-2d0db8e591513a1123057b8c330c946ddcb4fbc8.tar.xz | |
bufio: fix reading of many blank lines in a row
Fixes #9020.
LGTM=bradfitz, r
R=r, bradfitz
CC=golang-codereviews
https://golang.org/cl/170030043
Diffstat (limited to 'src/bufio/scan.go')
| -rw-r--r-- | src/bufio/scan.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bufio/scan.go b/src/bufio/scan.go index 73ad763b8f..364d159613 100644 --- a/src/bufio/scan.go +++ b/src/bufio/scan.go @@ -128,9 +128,10 @@ func (s *Scanner) Scan() bool { } s.token = token if token != nil { - if len(token) > 0 { + if s.err == nil || advance > 0 { s.empties = 0 } else { + // Returning tokens not advancing input at EOF. s.empties++ if s.empties > 100 { panic("bufio.Scan: 100 empty tokens without progressing") |