51 lines
2.4 KiB
Diff
51 lines
2.4 KiB
Diff
From: Alexander Larsson <alexl@redhat.com>
|
|
Date: Mon, 28 Nov 2016 15:31:04 +0100
|
|
Subject: ostree-repo-traverse: Don't leak floating GVariant
|
|
|
|
ostree_object_name_serialize returns a floating ref, so we need
|
|
to sink it before putting in the hashtable.
|
|
|
|
Closes: #595
|
|
Approved by: cgwalters
|
|
Origin: upstream, 2016.15, commit:fc107e5
|
|
---
|
|
src/libostree/ostree-repo-traverse.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
|
|
index e620a8a..46f8324 100644
|
|
--- a/src/libostree/ostree-repo-traverse.c
|
|
+++ b/src/libostree/ostree-repo-traverse.c
|
|
@@ -348,7 +348,7 @@ traverse_iter (OstreeRepo *repo,
|
|
ostree_repo_commit_traverse_iter_get_file (iter, &name, &checksum);
|
|
|
|
g_debug ("Found file object %s", checksum);
|
|
- key = ostree_object_name_serialize (checksum, OSTREE_OBJECT_TYPE_FILE);
|
|
+ key = g_variant_ref_sink (ostree_object_name_serialize (checksum, OSTREE_OBJECT_TYPE_FILE));
|
|
g_hash_table_replace (inout_reachable, key, key);
|
|
key = NULL;
|
|
}
|
|
@@ -363,11 +363,11 @@ traverse_iter (OstreeRepo *repo,
|
|
|
|
g_debug ("Found dirtree object %s", content_checksum);
|
|
g_debug ("Found dirmeta object %s", meta_checksum);
|
|
- key = ostree_object_name_serialize (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META);
|
|
+ key = g_variant_ref_sink (ostree_object_name_serialize (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META));
|
|
g_hash_table_replace (inout_reachable, key, key);
|
|
key = NULL;
|
|
|
|
- key = ostree_object_name_serialize (content_checksum, OSTREE_OBJECT_TYPE_DIR_TREE);
|
|
+ key = g_variant_ref_sink (ostree_object_name_serialize (content_checksum, OSTREE_OBJECT_TYPE_DIR_TREE));
|
|
if (!g_hash_table_lookup (inout_reachable, key))
|
|
{
|
|
g_hash_table_replace (inout_reachable, key, key);
|
|
@@ -463,7 +463,7 @@ ostree_repo_traverse_commit_union (OstreeRepo *repo,
|
|
OstreeRepoCommitState commitstate;
|
|
gboolean ignore_missing_dirs = FALSE;
|
|
|
|
- key = ostree_object_name_serialize (commit_checksum, OSTREE_OBJECT_TYPE_COMMIT);
|
|
+ key = g_variant_ref_sink (ostree_object_name_serialize (commit_checksum, OSTREE_OBJECT_TYPE_COMMIT));
|
|
|
|
if (g_hash_table_contains (inout_reachable, key))
|
|
break;
|