Merge pull request #1727 from uubulb/fix_sensors_darwin_arm64

sensors: avoid passing nil pointer to CFArrayGetCount
shirou · Oct 13, 2024 · a19cede · a19cede
2 parents c9da2cc + 10d9c04
commit a19cede
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/sensors/sensors_darwin_arm64.go b/sensors/sensors_darwin_arm64.go
@@ -96,6 +96,10 @@ func (ta *temperatureArm) getProductNames() []string {
 	ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors))
 	matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system))
 
+	if matchingsrvs == nil {
+		return nil
+	}
+
 	count := ta.cfArrayGetCount(uintptr(matchingsrvs))
 
 	var i int32
@@ -130,6 +134,10 @@ func (ta *temperatureArm) getThermalValues() []float64 {
 	ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors))
 	matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system))
 
+	if matchingsrvs == nil {
+		return nil
+	}
+
 	count := ta.cfArrayGetCount(uintptr(matchingsrvs))
 
 	var values []float64