From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 13 Apr 2016 19:18:19 +0000 (+0200)
Subject: commit: Fix crash if dfd_iter is NULL
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~456^2^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77ea287cd240825af311f8ac06f272b9a3981b54;p=ostree.git

commit: Fix crash if dfd_iter is NULL

in write_directory_content_to_mtree_internal dfd_iter can be NULL,
for instance if commiting from --tree=ref=FOO. Don't blindly de-ref
it to avoid crashing.

Closes: #256
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 0fb3b0fe..7f03e11d 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -2525,7 +2525,7 @@ write_directory_content_to_mtree_internal (OstreeRepo                  *self,
             }
 
           if (!get_modified_xattrs (self, modifier,
-                                    child_relpath, child_info, child, dfd_iter->fd, name,
+                                    child_relpath, child_info, child, dfd_iter != NULL ? dfd_iter->fd : -1, name,
                                     &xattrs,
                                     cancellable, error))
             goto out;