vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #848 from runcom/panic-img

Browse source 
pkg: storage: fix panic when no image names
This commit is contained in:
Mrunal Patel 2017-09-06 17:31:34 -07:00 • committed by GitHub
commit a81e90a9c9
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkg/storage/image.go
View file

@ -99,18 +99,22 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
return nil, err return nil, err
} }
for _, image := range images { for _, image := range images {
ref, err := svc.getRef(image.Names[0]) var size *uint64
if err != nil { if len(image.Names) != 0 {
return nil, err ref, err := svc.getRef(image.Names[0])
} if err != nil {
img, err := ref.NewImage(systemContext) return nil, err
if err != nil { }
return nil, err img, err := ref.NewImage(systemContext)
if err != nil {
return nil, err
}
size = imageSize(img)
} }
results = append(results, ImageResult{ results = append(results, ImageResult{
ID: image.ID, ID: image.ID,
Names: image.Names, Names: image.Names,
Size: imageSize(img), Size: size,
}) })
} }
} }