hokud: range check epoch for topk queries

dgryski · Jun 1, 2014 · 2fcfbc5 · 2fcfbc5
1 parent 9f30d02
commit 2fcfbc5
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/hokud/main.go b/hokud/main.go
@@ -158,7 +158,12 @@ func topkHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// FIXME(dgryski): racey once we move to a ring-buffer?
-	tk := TopKs[(int64(epoch)-Epoch0)/WindowSize]
+	t := (int64(epoch) - Epoch0) / WindowSize
+	if t < 0 || t > int64(len(TopKs)) {
+		http.Error(w, "bad epoch", http.StatusBadRequest)
+		return
+	}
+	tk := TopKs[t]
 	response := tk.Keys()
 
 	w.Header().Set("Content-Type", "application/json")
@@ -217,6 +222,8 @@ func loadDataFrom(file string, epoch0 int64, intervals uint, width, depth, topks
 
 	scanner := bufio.NewScanner(f)
 
+	Epoch0 = epoch0
+
 	Hoku = sketch.NewHokusai(epoch0, int64(WindowSize), intervals, width, depth)
 	TopKs = append(TopKs, topk.New(topks))