SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stat-util: add assert to silence coverity

Browse Source 
Coverity thinks _mntidb can be used uninitialized, but this
is not the case when r == 0. Add a bool variable to make it
clearer instead of reusing 'r' later, and an assert to guide
static analyzers.

CID#1644850

Follow-up for 5817c73391
This commit is contained in:
Luca Boccassi
2026-03-28 19:56:31 +00:00
parent 8fe512a02e
commit bf37ed0a65
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/stat-util.c
+8 -4
View File
@@ -516,15 +516,17 @@ int inode_same_at(int fda, const char *filea, int fdb, const char *fileb, int fl
goto fallback;
}
if (r == 0)
bool have_unique_mntid = r > 0;
if (!have_unique_mntid)
mntida = _mntida;
r = name_to_handle_at_try_fid(
fdb,
fileb,
&hb,
r > 0 ? NULL : &_mntidb, /* if we managed to get unique mnt id for a, insist on that for b */
r > 0 ? &mntidb : NULL,
have_unique_mntid ? NULL : &_mntidb, /* if we managed to get unique mnt id for a, insist on that for b */
have_unique_mntid ? &mntidb : NULL,
ntha_flags);
if (r < 0) {
if (is_name_to_handle_at_fatal_error(r))
@@ -532,8 +534,10 @@ int inode_same_at(int fda, const char *filea, int fdb, const char *fileb, int fl
goto fallback;
}
if (r == 0)
if (r == 0) {
assert(!have_unique_mntid); /* _mntidb was initialized by name_to_handle_at_try_fid() */
mntidb = _mntidb;
}
/* Now compare the two file handles */
if (!file_handle_equal(ha, hb))