Merge pull request #3408 from weaveworks/issues/3405-tracker-nil-deref

ipam: Do not deref nil in GET /ipinfo/tracker if tracker doesn't exist
This commit is contained in:
Bryan Boreham authored and GitHub committed 2018-09-25 12:29:03 +01:00
commit 427e7a6868
1 file changed
+5 -1
+5 -1
View File
@@ -199,6 +199,10 @@ func (alloc *Allocator) HandleHTTP(router *mux.Router, defaultSubnet address.CID
})
router.Methods("GET").Path("/ipinfo/tracker").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, alloc.tracker.String())
tracker := ""
if alloc.tracker != nil {
tracker = alloc.tracker.String()
}
fmt.Fprintf(w, tracker)
})
}