From 176a7b4778fbacbbb0824cf8c612656cd0985499 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Nov 2017 16:10:45 +0100 Subject: [PATCH] fetcher/curl: Fix invalid memory access in finalize() Reorder cleanup functions so that curl_multi_cleanup() runs before self->sockets is destroyed. This avoids an assert and invalid memory access in sock_cb where self->sockets is dereferenced during curl_multi_cleanup(). Closes: https://github.com/ostreedev/ostree/issues/1331 Closes: #1332 Approved by: cgwalters --- src/libostree/ostree-fetcher-curl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c index 1f64188258ed..8a23b16361ef 100644 --- a/src/libostree/ostree-fetcher-curl.c +++ b/src/libostree/ostree-fetcher-curl.c @@ -167,6 +167,7 @@ _ostree_fetcher_finalize (GObject *object) { OstreeFetcher *self = OSTREE_FETCHER (object); + curl_multi_cleanup (self->multi); g_free (self->remote_name); g_free (self->cookie_jar_path); g_free (self->proxy); @@ -177,7 +178,6 @@ _ostree_fetcher_finalize (GObject *object) g_clear_pointer (&self->timer_event, (GDestroyNotify)destroy_and_unref_source); if (self->mainctx) g_main_context_unref (self->mainctx); - curl_multi_cleanup (self->multi); G_OBJECT_CLASS (_ostree_fetcher_parent_class)->finalize (object); } -- 2.14.2