diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-16 15:05:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 15:05:28 -0400 |
| commit | 2a30b60666001b7039aaf5318ffeaa0374433f27 (patch) | |
| tree | 421afa18f2bdb6c03d2be3872b6135efdf8282da /pkg/api/handlers/libpod/containers.go | |
| parent | fcb22e82b518bd8de31bc152b78d2cbc6ab09964 (diff) | |
| parent | 29edeaa892df2f533f997adb0736f09a6f8e0965 (diff) | |
| download | podman-2a30b60666001b7039aaf5318ffeaa0374433f27.tar.gz podman-2a30b60666001b7039aaf5318ffeaa0374433f27.tar.bz2 podman-2a30b60666001b7039aaf5318ffeaa0374433f27.zip | |
Merge pull request #11598 from mheon/34_backportsreleasenotes
Backports and release notes for v3.4.0-RC1
Diffstat (limited to 'pkg/api/handlers/libpod/containers.go')
| -rw-r--r-- | pkg/api/handlers/libpod/containers.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 4639093f2..343c0d0b3 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -73,8 +73,13 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { } filterMap, err := util.PrepareFilters(r) + if err != nil { + utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError, + errors.Wrapf(err, "failed to decode filter parameters for %s", r.URL.String())) + return + } - if dErr := decoder.Decode(&query, r.URL.Query()); dErr != nil || err != nil { + if err := decoder.Decode(&query, r.URL.Query()); err != nil { utils.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String())) return |