packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Lebon 2017-10-04 14:41:15 +00:00 committed by Atomic Bot
parent 351ffdb977
commit c511ca0fae
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-repo-commit.c
View File

@ -2654,7 +2654,7 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
g_autoptr(GVariant) xattrs = NULL; g_autoptr(GVariant) xattrs = NULL;
gboolean xattrs_were_modified; gboolean xattrs_were_modified;
if (!get_final_xattrs (self, modifier, child_relpath, child_info, child, 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)) &xattrs_were_modified, cancellable, error))
return FALSE; 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 (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); file_input = (GInputStream*)g_file_read (child, cancellable, error);
if (!file_input) if (!file_input)
return FALSE; return FALSE;
} }
else else
{ {
g_assert (dfd_iter != NULL);
if (!ot_openat_read_stream (dfd_iter->fd, name, FALSE, if (!ot_openat_read_stream (dfd_iter->fd, name, FALSE,
&file_input, cancellable, error)) &file_input, cancellable, error))
return FALSE; return FALSE;