lib/commit: Fix memleak in bare-user devino hit path
authorColin Walters <walters@verbum.org>
Fri, 8 Dec 2017 19:39:01 +0000 (14:39 -0500)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 12 Dec 2017 14:03:18 +0000 (14:03 +0000)
I noticed this while chasing an entirely different issue:
https://github.com/projectatomic/rpm-ostree/pull/1139

Closes: #1370
Approved by: jlebon

src/libostree/ostree-repo-commit.c

index 107f2ecd62e1e76c4c8640293d2cbfd2d6897498..ca384fb8f3c5ce0d7f25d88714c8719128063dc0 100644 (file)
@@ -3004,12 +3004,13 @@ write_content_to_mtree_internal (OstreeRepo                  *self,
    * there.
    */
   g_autoptr(GVariant) source_xattrs = NULL;
+  g_autoptr(GFileInfo) source_child_info = NULL;
   if (loose_checksum && self->mode == OSTREE_REPO_MODE_BARE_USER)
     {
-      child_info = NULL;
-      if (!ostree_repo_load_file (self, loose_checksum, NULL, &child_info, &source_xattrs,
+      if (!ostree_repo_load_file (self, loose_checksum, NULL, &source_child_info, &source_xattrs,
                                   cancellable, error))
         return FALSE;
+      child_info = source_child_info;
     }
 
   /* Call the filter */