curl: Make socket callback during cleanup into no-op #3307
Merged
+14
−0
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
Because curl_multi_cleanup may invoke callbacks, we effectively have some circular references going on here. See discussion in curl/curl#14860 Basically what we do is the socket callback libcurl may invoke into a no-op when we detect we're finalizing. The data structures are owned by this object and not by the callbacks, and will be destroyed below. Note that e.g. g_hash_table_unref() may itself invoke callbacks, which is where some data is cleaned up. Signed-off-by: Colin Walters <[email protected]>
cgwalters
force-pushed
the
curl-reorder-teardown
branch
from
34e4f1a
to
4d755a8
Compare
cgwalters
changed the title
|
For people who are distributing ostree: in my opinion this patch is quite safe to cherry pick. The affected code here is during the teardown path and we're just making a called function into a no-op, so realistically the worst case is memory leaks. But for leaks: ASAN is still happy with this change, and from my auditing of the code again we're always relying on our own teardown, not on the libcurl socket callback. |
ThatOneCalculator
approved these changes
Sep 19, 2024
dbnicholson
approved these changes
Sep 19, 2024
Closed
4 tasks
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.
Because curl_multi_cleanup may invoke callbacks, we effectively have
some circular references going on here. See discussion in
curl/curl#14860
Basically what we do is the socket callback libcurl may invoke into a no-op when
we detect we're finalizing. The data structures are owned by this object and
not by the callbacks, and will be destroyed below. Note that
e.g. g_hash_table_unref() may itself invoke callbacks, which is where
some data is cleaned up.
Signed-off-by: Colin Walters [email protected]
Closes: #3299