Sanitize darwin thermal strings (#3294)

SuperQ · web-flow · commit e5caa394c8ed · 2025-03-31T12:46:39.000+02:00
Use `utils.SafeBytesToString()` to sanitize C strings the Darwin
thermal collector.

Signed-off-by: Ben Kochie &lt;superq@gmail.com&gt;
diff --git a/collector/thermal_darwin.go b/collector/thermal_darwin.go
@@ -50,6 +50,8 @@ import (
 	"log/slog"
 	"unsafe"
 
+	"github.com/prometheus/node_exporter/collector/utils"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -176,7 +178,7 @@ func mappingCFStringToString(s C.CFStringRef) string {
 	buf := make([]byte, maxBufLen)
 	var usedBufLen C.CFIndex
 	_ = C.CFStringGetBytes(s, C.CFRange{0, length}, C.kCFStringEncodingUTF8, C.UInt8(0), C.false, (*C.UInt8)(&buf[0]), maxBufLen, &usedBufLen)
-	return string(buf[:usedBufLen])
+	return utils.SafeBytesToString(buf[:usedBufLen])
 }
 
 func mappingCFNumberLongToInt(n C.CFNumberRef) int {

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ import (`
`50`	`50`	`"log/slog"`
`51`	`51`	`"unsafe"`
`52`	`52`
	`53`	`+ "github.com/prometheus/node_exporter/collector/utils"`
	`54`	`+`
`53`	`55`	`"github.com/prometheus/client_golang/prometheus"`
`54`	`56`	`)`
`55`	`57`
`@@ -176,7 +178,7 @@ func mappingCFStringToString(s C.CFStringRef) string {`
`176`	`178`	`buf := make([]byte, maxBufLen)`
`177`	`179`	`var usedBufLen C.CFIndex`
`178`	`180`	`_ = C.CFStringGetBytes(s, C.CFRange{0, length}, C.kCFStringEncodingUTF8, C.UInt8(0), C.false, (*C.UInt8)(&buf[0]), maxBufLen, &usedBufLen)`
`179`		`- return string(buf[:usedBufLen])`
	`181`	`+ return utils.SafeBytesToString(buf[:usedBufLen])`
`180`	`182`	`}`
`181`	`183`
`182`	`184`	`func mappingCFNumberLongToInt(n C.CFNumberRef) int {`