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

Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct

Browse source
This commit is contained in:
Solomon Hykes 2013-10-18 03:32:47 +00:00
commit c47e93fcbe
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
archive.go
View file

@ -120,7 +120,8 @@ func TarFilter(path string, compression Compression, filter []string, recursive
tmpDir := "" tmpDir := ""
if createFiles != nil { if createFiles != nil {
tmpDir, err := ioutil.TempDir("", "docker-tar") var err error // Can't use := here or we override the outer tmpDir
tmpDir, err = ioutil.TempDir("", "docker-tar")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -284,6 +285,9 @@ func CmdStream(cmd *exec.Cmd, input *string, atEnd func()) (io.Reader, error) {
if input != nil { if input != nil {
stdin, err := cmd.StdinPipe() stdin, err := cmd.StdinPipe()
if err != nil { if err != nil {
if atEnd != nil {
atEnd()
}
return nil, err return nil, err
} }
// Write stdin if any // Write stdin if any
@ -294,10 +298,16 @@ func CmdStream(cmd *exec.Cmd, input *string, atEnd func()) (io.Reader, error) {
} }
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {
if atEnd != nil {
atEnd()
}
return nil, err return nil, err
} }
stderr, err := cmd.StderrPipe() stderr, err := cmd.StderrPipe()
if err != nil { if err != nil {
if atEnd != nil {
atEnd()
}
return nil, err return nil, err
} }
pipeR, pipeW := io.Pipe() pipeR, pipeW := io.Pipe()