diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2020-08-10 15:19:02 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-08-10 16:29:55 +0200 |
| commit | 6865058f2fa9faac5ee8db6b616c0734b1bb5805 (patch) | |
| tree | be16433b236c648e12450f83d0109439146b9807 /pkg/domain/infra/abi | |
| parent | da00482ef29e0a04a690f1538391e38b0b951dd0 (diff) | |
| download | podman-6865058f2fa9faac5ee8db6b616c0734b1bb5805.tar.gz podman-6865058f2fa9faac5ee8db6b616c0734b1bb5805.tar.bz2 podman-6865058f2fa9faac5ee8db6b616c0734b1bb5805.zip | |
generate systemd: fix error handling
Fix a bug in the error handling which returned nil instead of an error
and ultimately lead to nil dereferences in the client. To prevent
future regressions, add a test and check for the error message.
Fixes: #7271
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/generate.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go index 93c4ede49..0b73ddd7e 100644 --- a/pkg/domain/infra/abi/generate.go +++ b/pkg/domain/infra/abi/generate.go @@ -20,9 +20,10 @@ func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string, if ctrErr == nil { // Generate the unit for the container. s, err := generate.ContainerUnit(ctr, options) - if err == nil { - return &entities.GenerateSystemdReport{Output: s}, nil + if err != nil { + return nil, err } + return &entities.GenerateSystemdReport{Output: s}, nil } // If it's not a container, we either have a pod or garbage. |