From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 25 Jul 2018 21:45:51 +0000 (-0400)
Subject: lib: Check for NULL pointers in some more places
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~20^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9482922e5e813290ee9952a55f2b574bb61b1ef6;p=ostree.git

lib: Check for NULL pointers in some more places

In `write_metadata_object()`, make sure when creating tombstone commits
that we're actually passed an expected checksum to use.

In `write_dir_entry_to_mtree_internal()`, sanity check that `dfd_iter`
is indeed not `NULL` before trying to dereference it.

Discovered by Coverity.

Closes: #1692
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 39f19362..632e396c 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1295,6 +1295,7 @@ write_metadata_object (OstreeRepo         *self,
   char actual_checksum[OSTREE_SHA256_STRING_LEN+1];
   if (is_tombstone)
     {
+      g_assert (expected_checksum != NULL);
       memcpy (actual_checksum, expected_checksum, sizeof (actual_checksum));
     }
   else
@@ -3309,6 +3310,7 @@ write_dir_entry_to_mtree_internal (OstreeRepo                  *self,
     }
   else
     {
+      g_assert (dfd_iter != NULL);
       g_auto(GLnxDirFdIterator) child_dfd_iter = { 0, };
 
       if (!glnx_dirfd_iterator_init_at (dfd_iter->fd, name, FALSE, &child_dfd_iter, error))