kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #32450 from miaoyq/fixed-a-bug-of-multireader 

Reset the positions for all readers of multireader before reading the data
This commit is contained in:
Brian Goff 2017-04-10 11:39:47 -04:00 committed by GitHub
parent a48f4257f0 fd06bd6f96
commit 8fabe07982
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/ioutils/multireader.go
View File

@ -152,7 +152,8 @@ func (r *multiReadSeeker) getOffsetToReader(rdr io.ReadSeeker) (int64, error) {
func (r *multiReadSeeker) Read(b []byte) (int, error) {
if r.pos == nil {
r.pos = &pos{0, 0}
// make sure all readers are at 0
r.Seek(0, os.SEEK_SET)
}
bLen := int64(len(b))

14
pkg/ioutils/multireader_test.go
View File

@ -55,6 +55,20 @@ func TestMultiReadSeekerReadAll(t *testing.T) {
if string(b) != expected {
t.Fatalf("ReadAll failed, got: %q, expected %q", string(b), expected)
}
// The positions of some readers are not 0
s1.Seek(0, os.SEEK_SET)
s2.Seek(0, os.SEEK_END)
s3.Seek(0, os.SEEK_SET)
mr = MultiReadSeeker(s1, s2, s3)
b, err = ioutil.ReadAll(mr)
if err != nil {
t.Fatal(err)
}
if string(b) != expected {
t.Fatalf("ReadAll failed, got: %q, expected %q", string(b), expected)
}
}
func TestMultiReadSeekerReadEach(t *testing.T) {