opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-26 09:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct varlink pull panic

Browse Source 
when pulling a non-existent image via varlink, we had a panic because
when we detected a pull error we sent the error over a channel but still
tried to deduce the image id on a nil object.

Fixes: 

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-04-05 09:27:30 -05:00
parent d86729e743
commit 340c6cfb72
1 changed files with 4 additions and 3 deletions

7
pkg/varlinkapi/images.go

@ -626,7 +626,6 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string, certDir, c
output := bytes.NewBuffer([]byte{}) output := bytes.NewBuffer([]byte{})
c := make(chan error) c := make(chan error)
go func() { go func() {
//err := newImage.PushImageToHeuristicDestination(getContext(), destname, manifestType, "", signaturePolicy, output, compress, so, &dockerRegistryOptions, nil)
if strings.HasPrefix(name, dockerarchive.Transport.Name()+":") { if strings.HasPrefix(name, dockerarchive.Transport.Name()+":") {
srcRef, err := alltransports.ParseImageName(name) srcRef, err := alltransports.ParseImageName(name)
if err != nil { if err != nil {
@ -635,14 +634,16 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string, certDir, c
newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, signaturePolicy, output) newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, signaturePolicy, output)
if err != nil { if err != nil {
c <- errors.Wrapf(err, "error pulling image from %q", name) c <- errors.Wrapf(err, "error pulling image from %q", name)
} else {
imageID = newImage[0].ID()
} }
imageID = newImage[0].ID()
} else { } else {
newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, signaturePolicy, "", output, &dockerRegistryOptions, so, false, nil) newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, signaturePolicy, "", output, &dockerRegistryOptions, so, false, nil)
if err != nil { if err != nil {
c <- errors.Wrapf(err, "unable to pull %s", name) c <- errors.Wrapf(err, "unable to pull %s", name)
} else {
imageID = newImage.ID()
} }
imageID = newImage.ID()
} }
c <- nil c <- nil
close(c) close(c)