mirror of
https://github.com/containers/podman.git
synced 2025-06-22 01:48:54 +08:00
Fix possible panic in libpod/image/prune.go
podman image prune paniced locally for me. The error handling was not done correctly and we could end up with a nil pointer dereference. [NO TESTS NEEDED] I have no idea how I could force an error in img.Size(). Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
This commit is contained in:
@ -134,10 +134,11 @@ func (ir *Runtime) PruneImages(ctx context.Context, all bool, filter []string) (
|
||||
}
|
||||
nameOrID := img.ID()
|
||||
s, err := img.Size(ctx)
|
||||
imgSize := *s
|
||||
imgSize := uint64(0)
|
||||
if err != nil {
|
||||
logrus.Warnf("Failed to collect image size for: %s, %s", nameOrID, err)
|
||||
imgSize = 0
|
||||
} else {
|
||||
imgSize = *s
|
||||
}
|
||||
if err := img.Remove(ctx, false); err != nil {
|
||||
if errors.Cause(err) == storage.ErrImageUsedByContainer {
|
||||
|
Reference in New Issue
Block a user