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 <[email protected]> Co-authored-by: Lauris BH <[email protected]>
go-gitea · May 5, 2020 · 91e6a7f · 91e6a7f
1 parent ff7eaa1
commit 91e6a7f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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 {