From 2d0db8e591513a1123057b8c330c946ddcb4fbc8 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 5 Nov 2014 22:50:24 -0500
Subject: 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
---
 src/bufio/scan.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/bufio/scan.go')

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")
-- 
cgit v1.3