vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2258 from tt/return-early-to-prevent-nil-pointer-dereference

Browse source 
Return early to prevent nil pointer dereference
This commit is contained in:
Derek McGowan 2017-04-27 09:38:04 -07:00 committed by GitHub
commit b7d5d9bfed
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
registry/handlers/app.go
View file

@ -859,8 +859,11 @@ func (app *App) eventBridge(ctx *Context, r *http.Request) notifications.Listene
// nameRequired returns true if the route requires a name. // nameRequired returns true if the route requires a name.
func (app *App) nameRequired(r *http.Request) bool { func (app *App) nameRequired(r *http.Request) bool {
route := mux.CurrentRoute(r) route := mux.CurrentRoute(r)
if route == nil {
return true
}
routeName := route.GetName() routeName := route.GetName()
return route == nil || (routeName != v2.RouteNameBase && routeName != v2.RouteNameCatalog) return routeName != v2.RouteNameBase && routeName != v2.RouteNameCatalog
} }
// apiBase implements a simple yes-man for doing overall checks against the // apiBase implements a simple yes-man for doing overall checks against the