kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix a bug which caused creation of empty images (and volumes) to crash. FIxes #995.

Browse source
This commit is contained in:
Solomon Hykes 2013-06-22 12:29:42 -07:00
parent ecd1fff9b0
commit 290b1973a9
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archive.go
View file

@ -108,7 +108,9 @@ func TarFilter(path string, compression Compression, filter []string) (io.Reader
// identity (uncompressed), gzip, bzip2, xz. // identity (uncompressed), gzip, bzip2, xz.
// FIXME: specify behavior when target path exists vs. doesn't exist. // FIXME: specify behavior when target path exists vs. doesn't exist.
func Untar(archive io.Reader, path string) error { func Untar(archive io.Reader, path string) error {
if archive == nil {
return fmt.Errorf("Empty archive")
}
bufferedArchive := bufio.NewReaderSize(archive, 10) bufferedArchive := bufio.NewReaderSize(archive, 10)
buf, err := bufferedArchive.Peek(10) buf, err := bufferedArchive.Peek(10)
if err != nil { if err != nil {

8
image.go
View file

@ -92,9 +92,11 @@ func StoreImage(img *Image, layerData Archive, root string, store bool) error {
defer file.Close() defer file.Close()
layerData = file layerData = file
} }
// If layerData is not nil, unpack it into the new layer
if err := Untar(layerData, layer); err != nil { if layerData != nil {
return err if err := Untar(layerData, layer); err != nil {
return err
}
} }
return StoreSize(img, root) return StoreSize(img, root)