Add missing nil pointer check

Fixes #189. This fixes some unchecked pointer accesses in the cache package. Independently of how errors are handled, these checks should be in place. Proper error handling as discussed in #189 and #181 can happen separately. Signed-off-by: Tobias Guggenmos <[email protected]>
prometheus-community · Jul 17, 2020 · f1aa796 · f1aa796
1 parent 4e7ee5f
commit f1aa796
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/rest/api.go b/rest/api.go
@@ -140,7 +140,11 @@ func (a *API) diagnostics(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	items := diagnostics.Diagnostics
+	items := []protocol.Diagnostic{}
+	if diagnostics != nil {
+		items = diagnostics.Diagnostics
+	}
+
 	limit := requestData.Limit
 	if limit != nil && uint64(len(items)) > *limit {
 		items = items[:*limit]
@@ -204,7 +208,10 @@ func (a *API) completion(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	items := completion.Items
+	items := []protocol.CompletionItem{}
+	if completion != nil {
+		items = completion.Items
+	}
 	limit := requestData.Limit
 	if limit != nil && uint64(len(items)) > *limit {
 		items = items[:*limit]