vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #17088 from Microsoft/sjw/archive_hang_fix

Browse source 
Fixing hang in archive.CopyFileWithTar with invalid dst
This commit is contained in:
Jess Frazelle 2015-10-19 17:18:25 -07:00
commit a45713d529
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
archive/archive.go
View file

@ -914,7 +914,11 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
}
}()
return archiver.Untar(r, filepath.Dir(dst), nil)
err = archiver.Untar(r, filepath.Dir(dst), nil)
if err != nil {
r.CloseWithError(err)
}
return err
}
// CopyFileWithTar emulates the behavior of the 'cp' command-line