GitList

Browse code

ioutils: fix race in access closeErr in bytespipe

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Alexander Morozov authored on 2016/06/07 03:29:47
Showing 1 changed files

pkg/ioutils/bytespipe.go index eca129b..72a04f3 100644

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

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