Fix malformed uname string (prometheus#2727)

* Fix malformed uname string * Make fix better * Reformat code for simplicity
forging2012 · May 16, 2017 · dea60bb · dea60bb
1 parent 713fef2
commit dea60bb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/cmd/prometheus/uname_linux.go b/cmd/prometheus/uname_linux.go
@@ -25,6 +25,7 @@ func Uname() string {
 	if err != nil {
 		log.Fatal("Error!")
 	}
+
 	str := "(" + charsToString(buf.Sysname[:])
 	str += " " + charsToString(buf.Release[:])
 	str += " " + charsToString(buf.Version[:])

diff --git a/cmd/prometheus/uname_linux_int8.go b/cmd/prometheus/uname_linux_int8.go
@@ -17,9 +17,12 @@
 package main
 
 func charsToString(ca []int8) string {
-	s := make([]byte, len(ca))
-	for i, c := range ca {
-		s[i] = byte(c)
+	s := make([]byte, 0, len(ca))
+	for _, c := range ca {
+		if byte(c) == 0 {
+			break
+		}
+		s = append(s, byte(c))
 	}
-	return string(s[0:len(ca)])
+	return string(s)
 }
diff --git a/cmd/prometheus/uname_linux_uint8.go b/cmd/prometheus/uname_linux_uint8.go
@@ -17,9 +17,12 @@
 package main
 
 func charsToString(ca []uint8) string {
-	s := make([]byte, len(ca))
-	for i, c := range ca {
-		s[i] = byte(c)
+	s := make([]byte, 0, len(ca))
+	for _, c := range ca {
+		if byte(c) == 0 {
+			break
+		}
+		s = append(s, byte(c))
 	}
-	return string(s[0:len(ca)])
+	return string(s)
 }