packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/pull: Properly remove temporary remotes 

For P2P pulls ostree adds temporary remotes and removes them in
find_remotes_cb(). However, if an OstreeRepoFinderResult gets freed
during the course of that function, the OstreeRemote in the result is
freed but a pointer to it remains in the remotes_to_remove array. This
means that when _ostree_repo_remove_remote() gets called on it at the
end of the function it will fail. In my case the resulting error was
"OSTree-CRITICAL **: _ostree_repo_remove_remote: assertion 'remote->name
!= NULL' failed" but I think it could also seg fault.

This commit adds a reference to the remote so it can be properly removed
when we're finished with it.

Closes: #1450
Approved by: giuseppe
This commit is contained in:
Matthew Leeds 2018-02-08 14:13:45 -08:00 committed by Atomic Bot
parent 88d27fb3f1
commit 5848de93a4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-repo-pull.c
View File

@ -4920,7 +4920,7 @@ find_remotes_cb (GObject *obj,
* remote, or %NULL if the remote doesn’t have that ref. */ * remote, or %NULL if the remote doesn’t have that ref. */
n_refs = g_strv_length ((gchar **) refs); /* it’s not a GStrv, but this works */ n_refs = g_strv_length ((gchar **) refs); /* it’s not a GStrv, but this works */
refs_and_remotes_table = pointer_table_new (n_refs, results->len); refs_and_remotes_table = pointer_table_new (n_refs, results->len);
remotes_to_remove = g_ptr_array_new_with_free_func (NULL); remotes_to_remove = g_ptr_array_new_with_free_func ((GDestroyNotify) ostree_remote_unref);
/* Fetch and validate the summary file for each result. */ /* Fetch and validate the summary file for each result. */
/* FIXME: All these downloads could be parallelised; that requires the /* FIXME: All these downloads could be parallelised; that requires the
@ -4940,7 +4940,7 @@ find_remotes_cb (GObject *obj,
/* Add the remote to our internal list of remotes, so other libostree /* Add the remote to our internal list of remotes, so other libostree
* API can access it. */ * API can access it. */
if (!_ostree_repo_add_remote (self, result->remote)) if (!_ostree_repo_add_remote (self, result->remote))
g_ptr_array_add (remotes_to_remove, result->remote); g_ptr_array_add (remotes_to_remove, ostree_remote_ref (result->remote));
g_debug ("%s: Fetching summary for remote ‘%s’ with keyring ‘%s’.", g_debug ("%s: Fetching summary for remote ‘%s’ with keyring ‘%s’.",
G_STRFUNC, result->remote->name, result->remote->keyring); G_STRFUNC, result->remote->name, result->remote->keyring);