From 91e6a7f7ea26890f3fc8476d31d5a5a8c80a07b2 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 5 May 2020 23:48:24 +0100 Subject: [PATCH] api.Context.NotFound(...) should tolerate nil (#11288) (#11306) There is an unfortunate signature change with the api.Context NotFound function; whereas the normal modules/context/Context NotFound function requires an error or nil, the api.Context variant will panic with an NPE if a nil is provided. This PR will allow api.Context.NotFound to tolerate a being passed a nil. Signed-off-by: Andrew Thornton Co-authored-by: Lauris BH --- modules/context/api.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/context/api.go b/modules/context/api.go index fd9983c52..4e189ce07 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -212,6 +212,11 @@ func (ctx *APIContext) NotFound(objs ...interface{}) { var message = "Not Found" var errors []string for _, obj := range objs { + // Ignore nil + if obj == nil { + continue + } + if err, ok := obj.(error); ok { errors = append(errors, err.Error()) } else {