docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23317 from LK4D4/fix_bytepipe_race 

ioutils: fix race in access closeErr in bytespipe
This commit is contained in:
Antonio Murdaca 2016-06-06 20:46:01 +02:00
parent 5ce2f14f9b b32478488c
commit 3d80884f3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/ioutils/bytespipe.go
View File

@ -133,8 +133,9 @@ func (bp *BytesPipe) Read(p []byte) (n int, err error) {
} }
bp.wait.Wait() bp.wait.Wait()
if bp.bufLen == 0 && bp.closeErr != nil { if bp.bufLen == 0 && bp.closeErr != nil {
err := bp.closeErr
bp.mu.Unlock() bp.mu.Unlock()
return 0, bp.closeErr return 0, err
} }
} }