summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/compat
diff options
context:
space:
mode:
authorJelle van der Waa <jvanderwaa@redhat.com>2021-09-14 22:23:01 +0200
committerMatthew Heon <mheon@redhat.com>2021-09-16 11:00:05 -0400
commit507000a304b34850c358d75af3f6291ed444c8f6 (patch)
tree1b8ebfb4869a47dc06e3b167da9947184379a15c /pkg/api/handlers/compat
parent702e524ff7fba48e7b4de5b6847cf0980be7bb60 (diff)
downloadpodman-507000a304b34850c358d75af3f6291ed444c8f6.tar.gz
podman-507000a304b34850c358d75af3f6291ed444c8f6.tar.bz2
podman-507000a304b34850c358d75af3f6291ed444c8f6.zip
api: handle nil pointer dereference in rest endpoints
When `?all=garbage` is passed to an API endpoint schema validation fails and err is nil. Wrapf uses err to create an error message causing a nil pointer dereference. Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>
Diffstat (limited to 'pkg/api/handlers/compat')
-rw-r--r--pkg/api/handlers/compat/containers.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 26e1bf00b..a15fdb553 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -104,8 +104,12 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
}
filterMap, err := util.PrepareFilters(r)
+ if err != nil {
+ utils.Error(w, "Something went wrong.", 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, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "failed to parse parameters for %s", r.URL.String()))
return
}