imagebuildah: don't leak image structs

When reading the configuration of a cache candidate, don't leak the object reference for the Image. Signed-off-by: Nalin Dahyabhai <[email protected]> Closes: #1520 Approved by: rhatdan
containers · Apr 16, 2019 · ffd8d6a · ffd8d6a
1 parent 32accb9
commit ffd8d6a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/imagebuildah/build.go b/imagebuildah/build.go
@@ -1225,11 +1225,12 @@ func (b *Executor) getImageHistory(ctx context.Context, imageID string) ([]v1.Hi
 	}
 	ref, err := imageRef.NewImage(ctx, nil)
 	if err != nil {
-		return nil, errors.Wrap(err, "error creating new image from reference")
+		return nil, errors.Wrapf(err, "error creating new image from reference to image %q", imageID)
 	}
+	defer ref.Close()
 	oci, err := ref.OCIConfig(ctx)
 	if err != nil {
-		return nil, errors.Wrapf(err, "error getting oci config of image %q", imageID)
+		return nil, errors.Wrapf(err, "error getting possibly-converted OCI config of image %q", imageID)
 	}
 	return oci.History, nil
 }