Prevent file handles from leaking on failed open. #67
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
Since the webcam open function only returns the open fh on success, we need to close the FH ourselves in the event that the subsequent tests fail.
edaniels
reviewed
Apr 1, 2024
webcam.go
Outdated
| @@ -34,15 +34,25 @@ type Control struct { | |||
| // Open a webcam with a given path | |||
| // Checks if device is a v4l2 device and if it is | |||
| // capable to stream video | |||
| func Open(path string) (*Webcam, error) { | |||
| func Open(path string) (w *Webcam, err error) { | |||
| w = nil | |||
There was a problem hiding this comment.
suggestion: how about var success bool and the defer checks !success and set it to true at the end of the function. might make this less error prone?
There was a problem hiding this comment.
I am fine with that as well. Changed have been made!
edaniels
approved these changes
Apr 1, 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.
Since the webcam open function only returns the open fh on success, we need to close the FH ourselves in the event that the subsequent tests fail.
Testing:
iterate over all files in /dev/video* and attempt to open each one as a webcam
then log the details of said video device if successfully opened as a webcam.
This was used to find the initial leak of file handles, as a device which opend fine, but failed to be recognized as a valid webcam (
supportsVideoCapture/supportsVideoStreaming)the handle would be lost.