From 22ed96d23cc1ffadb30e119a0677036348707f52 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 30 Oct 2016 14:11:23 +0000 Subject: [PATCH] ot_admin_builtin_set_origin: don't leak options GVariant Found by valgrind memcheck. Signed-off-by: Simon McVittie Closes: #559 Approved by: cgwalters --- src/ostree/ot-admin-builtin-set-origin.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ostree/ot-admin-builtin-set-origin.c b/src/ostree/ot-admin-builtin-set-origin.c index 8b32eb79..0e79ab5e 100644 --- a/src/ostree/ot-admin-builtin-set-origin.c +++ b/src/ostree/ot-admin-builtin-set-origin.c @@ -96,6 +96,7 @@ ot_admin_builtin_set_origin (int argc, char **argv, GCancellable *cancellable, G { char **iter; g_autoptr(GVariantBuilder) optbuilder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}")); + g_autoptr(GVariant) options = NULL; for (iter = opt_set; iter && *iter; iter++) { @@ -109,11 +110,13 @@ ot_admin_builtin_set_origin (int argc, char **argv, GCancellable *cancellable, G g_variant_builder_add (optbuilder, "{s@v}", subkey, g_variant_new_variant (g_variant_new_string (subvalue))); } - + + options = g_variant_ref_sink (g_variant_builder_end (optbuilder)); + if (!ostree_repo_remote_change (repo, NULL, OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS, remotename, url, - g_variant_builder_end (optbuilder), + options, cancellable, error)) goto out; }