From: Dan Nicholson <nicholson@endlessm.com>
Date: Wed, 23 Mar 2016 16:32:29 +0000 (-0700)
Subject: traverse: Require variant when traversing dirtree
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~479^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7524e904b90d24929dd8b9ac975aed2b46550edf;p=ostree.git

traverse: Require variant when traversing dirtree

The dirtree object is required for traversing, so don't use the
load_variant_if_exists() function. This will return a
G_IO_ERROR_NOT_FOUND to the caller rather than trying to ref a NULL
variant in ostree_repo_commit_traverse_iter_init_dirtree() if the object
is missing.

https://bugzilla.gnome.org/show_bug.cgi?id=764091
---

diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
index 85ce317d..97bd1023 100644
--- a/src/libostree/ostree-repo-traverse.c
+++ b/src/libostree/ostree-repo-traverse.c
@@ -377,9 +377,8 @@ traverse_dirtree (OstreeRepo           *repo,
   ostree_cleanup_repo_commit_traverse_iter
     OstreeRepoCommitTraverseIter iter = { 0, };
 
-  if (!ostree_repo_load_variant_if_exists (repo, OSTREE_OBJECT_TYPE_DIR_TREE,
-                                           checksum, &dirtree,
-                                           error))
+  if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_DIR_TREE, checksum,
+                                 &dirtree, error))
     goto out;
 
   if (!ostree_repo_commit_traverse_iter_init_dirtree (&iter, repo, dirtree,