Skip to content

Commit 8640b97

Browse files
kytrinyxadg
authored andcommitted
Revert "reader: move error check in validate"
This reverts commit 23d7fec. When using Read, process the returned data before looking for errors. Errors happened after the returned data, so they should be processed after the data too. Change-Id: I17f935521b76a35db5967cdb5e9b87bd0ab8a1bb Reviewed-on: https://go-review.googlesource.com/16103 Reviewed-by: Andrew Gerrand <adg@golang.org>
1 parent b9bdbaa commit 8640b97

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

reader/validate.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ func Validate(r io.Reader) {
1515
i, o := 0, 0
1616
for ; i < 1<<20 && o < 1<<20; i++ { // test 1mb
1717
n, err := r.Read(b)
18-
if err != nil {
19-
fmt.Fprintf(os.Stderr, "read error: %v\n", err)
20-
return
21-
}
2218
for i, v := range b[:n] {
2319
if v != 'A' {
2420
fmt.Fprintf(os.Stderr, "got byte %x at offset %v, want 'A'\n", v, o+i)
2521
return
2622
}
2723
}
2824
o += n
25+
if err != nil {
26+
fmt.Fprintf(os.Stderr, "read error: %v\n", err)
27+
return
28+
}
2929
}
3030
if o == 0 {
3131
fmt.Fprintf(os.Stderr, "read zero bytes after %d Read calls\n", i)

0 commit comments

Comments
 (0)