beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #39445 from lzhfromustc/master

Browse source 
ioutils: Fixed a potential data race in bytespipe
This commit is contained in:
Michael Crosby 2019-07-02 13:02:47 -04:00 committed by GitHub
commit a43a2ed746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

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