Merge pull request #1727 from uubulb/fix_sensors_darwin_arm64

sensors: avoid passing nil pointer to CFArrayGetCount
pull/1737/head
shirou 5 months ago committed by GitHub
commit a19cedeb30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -96,6 +96,10 @@ func (ta *temperatureArm) getProductNames() []string {
ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors)) ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors))
matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system)) matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system))
if matchingsrvs == nil {
return nil
}
count := ta.cfArrayGetCount(uintptr(matchingsrvs)) count := ta.cfArrayGetCount(uintptr(matchingsrvs))
var i int32 var i int32
@ -130,6 +134,10 @@ func (ta *temperatureArm) getThermalValues() []float64 {
ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors)) ta.ioHIDEventSystemClientSetMatching(uintptr(system), uintptr(ta.sensors))
matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system)) matchingsrvs := ta.ioHIDEventSystemClientCopyServices(uintptr(system))
if matchingsrvs == nil {
return nil
}
count := ta.cfArrayGetCount(uintptr(matchingsrvs)) count := ta.cfArrayGetCount(uintptr(matchingsrvs))
var values []float64 var values []float64

Loading…
Cancel
Save