summaryrefslogtreecommitdiffstats
path: root/libsmartcols
diff options
context:
space:
mode:
authorKarel Zak2019-05-15 17:46:31 +0200
committerKarel Zak2019-05-15 17:46:31 +0200
commite2a0f2634151c36e7dd229db31ee54933bcf28d1 (patch)
tree36376aa4c978d600f4b97a93d813fa45b4d61a2a /libsmartcols
parentlibmount: fix memory leak on error [coverity scan] (diff)
downloadkernel-qcow2-util-linux-e2a0f2634151c36e7dd229db31ee54933bcf28d1.tar.gz
kernel-qcow2-util-linux-e2a0f2634151c36e7dd229db31ee54933bcf28d1.tar.xz
kernel-qcow2-util-linux-e2a0f2634151c36e7dd229db31ee54933bcf28d1.zip
libsmartcols: (groups) improve scols_table_group_lines() args check [coverity scan]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libsmartcols')
-rw-r--r--libsmartcols/src/grouping.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsmartcols/src/grouping.c b/libsmartcols/src/grouping.c
index 0e4851e30..43376fdc7 100644
--- a/libsmartcols/src/grouping.c
+++ b/libsmartcols/src/grouping.c
@@ -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;