Merge pull request #23317 from LK4D4/fix_bytepipe_race

ioutils: fix race in access closeErr in bytespipe
moby · Jun 6, 2016 · 3d80884 · 3d80884
2 parents 5ce2f14 + b324784
commit 3d80884
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/ioutils/bytespipe.go b/pkg/ioutils/bytespipe.go
@@ -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
 		}
 	}