]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libsmartcols: (groups) improve scols_table_group_lines() args check [coverity scan]
authorKarel Zak <kzak@redhat.com>
Wed, 15 May 2019 15:46:31 +0000 (17:46 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 15 May 2019 15:46:31 +0000 (17:46 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
libsmartcols/src/grouping.c

index 0e4851e30b44e6f98d950a26dee6af9f2e2437c1..43376fdc79276dc1699aea7913291d16a32d5429 100644 (file)
@@ -495,11 +495,11 @@ int scols_table_group_lines(      struct libscols_table *tb,
 {
        struct libscols_group *gr = NULL;
 
-       if (!tb || (!ln && !member)) {
-               DBG(GROUP, ul_debugobj(gr, "failed group lines (no table, line or member)"));
+       if (!tb || !member) {
+               DBG(GROUP, ul_debugobj(gr, "failed group lines (no table or member)"));
                return -EINVAL;
        }
-       if (ln && member)  {
+       if (ln)  {
                if (ln->group && !member->group) {
                        DBG(GROUP, ul_debugobj(gr, "failed group lines (new group, line member of another)"));
                        return -EINVAL;