diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 19:27:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-03 19:27:54 +0200 |
commit | df0141dc200fc55f750bd3d878b98d4af4110e03 (patch) | |
tree | 6f78703e35a66e96d696a917f7946956feba67bd /pkg/domain | |
parent | 9bd48a64bbe63c0b8da4dfd3841f4d822fa1d5fb (diff) | |
parent | 4b37d4d5af50b67742e5f3097075e7493488d91a (diff) | |
download | podman-df0141dc200fc55f750bd3d878b98d4af4110e03.tar.gz podman-df0141dc200fc55f750bd3d878b98d4af4110e03.tar.bz2 podman-df0141dc200fc55f750bd3d878b98d4af4110e03.zip |
Merge pull request #6473 from mheon/fix_inspect_segfault
Fix a segfault in `podman inspect -l` w/ no containers
Diffstat (limited to 'pkg/domain')
-rw-r--r-- | pkg/domain/infra/abi/containers.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 706fcec47..ad0e957e9 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -44,8 +44,10 @@ func getContainersAndInputByContext(all, latest bool, names []string, runtime *l ctrs, err = runtime.GetAllContainers() case latest: ctr, err = runtime.GetLatestContainer() - rawInput = append(rawInput, ctr.ID()) - ctrs = append(ctrs, ctr) + if err == nil { + rawInput = append(rawInput, ctr.ID()) + ctrs = append(ctrs, ctr) + } default: for _, n := range names { ctr, e := runtime.LookupContainer(n) |