core: Fix a few memory leaks
This commit is contained in:
parent
c9c4dbfb22
commit
e014b2d9c2
|
|
@ -960,6 +960,7 @@ commit_staged_file (OstreeRepo *self,
|
||||||
ret = TRUE;
|
ret = TRUE;
|
||||||
out:
|
out:
|
||||||
g_clear_object (&dest_file);
|
g_clear_object (&dest_file);
|
||||||
|
g_clear_object (&checksum_dir);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2261,10 +2262,9 @@ checkout_tree (OstreeRepo *self,
|
||||||
{
|
{
|
||||||
const char *checksum = _ostree_repo_file_get_checksum ((OstreeRepoFile*)src_child);
|
const char *checksum = _ostree_repo_file_get_checksum ((OstreeRepoFile*)src_child);
|
||||||
|
|
||||||
g_clear_object (&object_path);
|
|
||||||
|
|
||||||
if (priv->mode == OSTREE_REPO_MODE_ARCHIVE)
|
if (priv->mode == OSTREE_REPO_MODE_ARCHIVE)
|
||||||
{
|
{
|
||||||
|
ot_clear_gvariant (&archive_metadata);
|
||||||
if (!ostree_repo_load_variant (self, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META, checksum, &archive_metadata, error))
|
if (!ostree_repo_load_variant (self, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META, checksum, &archive_metadata, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
|
@ -2289,6 +2289,7 @@ checkout_tree (OstreeRepo *self,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
g_clear_object (&object_path);
|
||||||
object_path = ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_RAW_FILE);
|
object_path = ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_RAW_FILE);
|
||||||
|
|
||||||
if (link (ot_gfile_get_path_cached (object_path), ot_gfile_get_path_cached (dest_path)) < 0)
|
if (link (ot_gfile_get_path_cached (object_path), ot_gfile_get_path_cached (dest_path)) < 0)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue