open-uri: Close fd after opening dir or file #530
Merged
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
Use new XdpFd type with g_auto to make sure the file descriptor gets closed when the function finishes.
jhenstridge
reviewed
Feb 15, 2021
| @@ -586,7 +586,7 @@ handle_open_in_thread_func (GTask *task, | |||
| gboolean ask_for_content_type; | |||
| GVariantBuilder opts_builder; | |||
| gboolean skip_app_chooser = FALSE; | |||
| int fd; | |||
| g_auto(XdpFd) fd = -1; | |||
There was a problem hiding this comment.
I was looking through the post-1.8.0 changes in the repo, and this change looked a bit suspect.
In particular, this function still has a close(fd) call buried in its body, so the destructor will sometimes call close() on a stale (or reallocated) file descriptor. Might it be better to manage the lifetime by storing the fd with g_object_set_data_full() with an appropriate destroy_notify function (i.e. something that calls close() on values >= 0).
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.
Use new XdpFd type with g_auto to make sure the file descriptor gets
closed when the function finishes.