Define and use cleanup helpers for libarchive
This should fix some of the ASAN leaks around libarchive usage, and is generally better. Closes: #609 Approved by: jlebon
This commit is contained in:
1 parent
c733e21a84
commit
7bb0ff46a4
7 files changed
+61
-22
No files matched your search
@@ -913,10 +913,9 @@ ostree_repo_write_archive_to_mtree (OstreeRepo *self,
|
||||
{
|
||||
#ifdef HAVE_LIBARCHIVE
|
||||
gboolean ret = FALSE;
|
||||
struct archive *a = NULL;
|
||||
ot_cleanup_read_archive struct archive *a = archive_read_new ();
|
||||
OstreeRepoImportArchiveOptions opts = { 0, };
|
||||
|
||||
a = archive_read_new ();
|
||||
#ifdef HAVE_ARCHIVE_READ_SUPPORT_FILTER_ALL
|
||||
archive_read_support_filter_all (a);
|
||||
#else
|
||||
@@ -945,7 +944,6 @@ ostree_repo_write_archive_to_mtree (OstreeRepo *self,
|
||||
if (a)
|
||||
{
|
||||
(void)archive_read_close (a);
|
||||
(void)archive_read_free (a);
|
||||
}
|
||||
return ret;
|
||||
#else
|
||||
|
||||
Reference in new issue
Block a user