sensors: avoid passing nil pointer to CFArrayGetCount #1727
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I need this fix too. |
shirou
reviewed
Oct 12, 2024
| @@ -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 | |||
There was a problem hiding this comment.
Returning nil may cause another panic on dumpNameValues(). How about return empty value?
Suggested change
| return nil | |
| return []string{} |
There was a problem hiding this comment.
I think the results of passing either nil or empty value to dumpNameValues() are same, both returning an empty []TemperatureStat
There was a problem hiding this comment.
I know that in Go, an empty slice can be represented as nil. However, due to the subtle differences, I thought that an empty slice was more explicit and therefore preferable. But after reviewing it again, I now see that a nil slice is considered better, so I retract my previous opinion. Thank you for your comment.
| @@ -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 | |||
There was a problem hiding this comment.
ditto
Suggested change
| return nil | |
| return []float64{} |
shirou
approved these changes
Oct 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add nil check for
matchingsrvsbefore callingCFArrayGetCount, as some virtual environments (e.g., Github's action runners) lack sensor data.Fix #1726