diff options
| author | Kyle Consalus <consalus@gmail.com> | 2010-09-01 15:15:37 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2010-09-01 15:15:37 -0700 |
| commit | f8a67d79d19776efd43dc36d597bb3cbfdb779f3 (patch) | |
| tree | 48c117b4950bc66920208d4fcd9bdb855487823d | |
| parent | 3d76135ee5b6084b1497b12421e3d3fe8b160a16 (diff) | |
| download | go-f8a67d79d19776efd43dc36d597bb3cbfdb779f3.tar.gz go-f8a67d79d19776efd43dc36d597bb3cbfdb779f3.zip | |
Fix incorrect reporting of error in Scanner.next() when Read reads > 0 bytes but returns os.EOF.
R=golang-dev, gri1, gri
CC=golang-dev
https://golang.org/cl/2083042
| -rw-r--r-- | src/pkg/scanner/scanner.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pkg/scanner/scanner.go b/src/pkg/scanner/scanner.go index 0f864f8ff3..11aa9f43f3 100644 --- a/src/pkg/scanner/scanner.go +++ b/src/pkg/scanner/scanner.go @@ -236,8 +236,10 @@ func (s *Scanner) next() int { if s.srcEnd == 0 { return EOF } - s.error(err.String()) - break + if err != os.EOF { + s.error(err.String()) + break + } } } // at least one byte |