shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-03 05:18:24 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3307 from cgwalters/curl-reorder-teardown

Browse Source 
curl: Make socket callback during cleanup into no-op
This commit is contained in:
Dan Nicholson 2024-09-18 21:36:13 -06:00 committed by GitHub
commit e560092f54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libostree/ostree-fetcher-curl.c
View File

@ -78,6 +78,7 @@ struct OstreeFetcher
struct curl_slist *extra_headers;
int tmpdir_dfd;
bool force_anonymous;
bool finalizing; // Set if we're in the process of teardown
char *custom_user_agent;
guint32 opt_low_speed_limit;
guint32 opt_low_speed_time;
@ -180,6 +181,15 @@ _ostree_fetcher_finalize (GObject *object)
{
OstreeFetcher *self = OSTREE_FETCHER (object);
// Because curl_multi_cleanup may invoke callbacks, we effectively have
// some circular references going on here. See discussion in
// https://github.com/curl/curl/issues/14860
// Basically what we do is make most callbacks libcurl may invoke into no-ops 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.
self->finalizing = true;
curl_multi_cleanup (self->multi);
g_free (self->remote_name);
g_free (self->tls_ca_db_path);
@ -529,6 +539,10 @@ sock_cb (CURL *easy, curl_socket_t s, int what, void *cbp, void *sockp)
OstreeFetcher *fetcher = cbp;
SockInfo *fdp = (SockInfo *)sockp;
// We do nothing if we're in the process of teardown; see below.
if (fetcher->finalizing)
return 0;
if (what == CURL_POLL_REMOVE)
{
if (!g_hash_table_remove (fetcher->sockets, fdp))