From c511ca0fae0e352d52bb7d1a24b4c1d08c5a8ec9 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 4 Oct 2017 14:41:15 +0000 Subject: [PATCH] lib/commit: minor coverity fix Appease Coverity by using the same condition for both the ternary check and the if-condition later on. It should be smart enough to figure out that `dir_enum == NULL` implies that `dfd_iter != NULL` from the assertion at the top of the function. Coverity CID: #1457318 Closes: #1250 Approved by: cgwalters --- src/libostree/ostree-repo-commit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 0060120f..029dd01b 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -2654,7 +2654,7 @@ write_directory_content_to_mtree_internal (OstreeRepo *self, g_autoptr(GVariant) xattrs = NULL; gboolean xattrs_were_modified; if (!get_final_xattrs (self, modifier, child_relpath, child_info, child, - dfd_iter != NULL ? dfd_iter->fd : -1, name, &xattrs, + dir_enum != NULL ? -1 : dfd_iter->fd, name, &xattrs, &xattrs_were_modified, cancellable, error)) return FALSE; @@ -2677,14 +2677,16 @@ write_directory_content_to_mtree_internal (OstreeRepo *self, { if (g_file_info_get_file_type (modified_info) == G_FILE_TYPE_REGULAR) { - if (child != NULL) + if (dir_enum != NULL) { + g_assert (child != NULL); file_input = (GInputStream*)g_file_read (child, cancellable, error); if (!file_input) return FALSE; } else { + g_assert (dfd_iter != NULL); if (!ot_openat_read_stream (dfd_iter->fd, name, FALSE, &file_input, cancellable, error)) return FALSE;