]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_db: fix broken logic in error path
authorDarrick J. Wong <djwong@kernel.org>
Thu, 27 Apr 2023 19:02:33 +0000 (12:02 -0700)
committerCarlos Maiolino <cem@kernel.org>
Wed, 10 May 2023 13:13:27 +0000 (15:13 +0200)
smatch complains proceeding into the if body if leaf is a null pointer:

check.c:3614 process_leaf_node_dir_v2_int() warn: variable dereferenced before check 'leaf' (see line 3518)

However, the logic here is misleading and broken -- what we're trying to
do is switch between the v4 and v5 variants of the directory check.
We're using @leaf3 being a null pointer (or not) to determine v4 vs. v5,
so the "!" part of the comparison is correct, but the variable used
(leaf) is not.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
db/check.c

index 964756d0ae57cdcf64effee49a41ac4fcf04adea..fdf1f6a1e3c50c054665285c5f99cd86bd1f1c1c 100644 (file)
@@ -3452,7 +3452,7 @@ process_leaf_node_dir_v2_int(
                                 id->ino, dabno, stale,
                                 be16_to_cpu(leaf3->hdr.stale));
                error++;
-       } else if (!leaf && stale != be16_to_cpu(leaf->hdr.stale)) {
+       } else if (!leaf3 && stale != be16_to_cpu(leaf->hdr.stale)) {
                if (!sflag || v)
                        dbprintf(_("dir %lld block %d stale mismatch "
                                 "%d/%d\n"),