Merge branch 'statsd_input_bounds_check' into versions/0.9

mozilla-services · Apr 22, 2015 · 11e668c · 11e668c
2 parents 861728d + 8e3ed85
commit 11e668c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@
 Bug Handling
 ------------
 
+* Added bounds check for truncated inputs lines to StatsdInput.
+
 * Fixed ElasticSearch recovery after full queue when `queue_full_action` is
   set to "drop" or "block".
 

diff --git a/plugins/statsd/statsd_input.go b/plugins/statsd/statsd_input.go
@@ -166,7 +166,7 @@ func parseMessage(message []byte) ([]Stat, [][]byte) {
 		}
 
 		pipePos := bytes.IndexByte(line[colonPos+1:], '|') + colonPos + 1
-		if pipePos == -1 || len(line) < pipePos+2 {
+		if pipePos == -1 || pipePos == colonPos || len(line) < pipePos+2 {
 			badLines = append(badLines, line)
 			continue
 		}