From: Boris Egorov <egorov@linux.com>
Date: Fri, 19 Jun 2015 19:41:01 +0000 (+0600)
Subject: cfdisk: fix condition logic [cppcheck]
X-Git-Tag: v2.27-rc1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13c551f259423d97e6edf1380d5d9e93d77ebc89;p=thirdparty%2Futil-linux.git

cfdisk: fix condition logic [cppcheck]

[disk-utils/cfdisk.c:1181] -> [disk-utils/cfdisk.c:1181]: (warning)
Possible null pointer dereference: data - otherwise it is redundant to
check it against null.

Signed-off-by: Boris Egorov <egorov@linux.com>
---

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 6f26a3d44d..462710719a 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1178,7 +1178,7 @@ inline static int extra_insert_pair(struct cfdisk_line *l, const char *name, con
 
 	assert(l);
 
-	if (!data && !*data)
+	if (!data || !*data)
 		return 0;
 
 	lsl = scols_table_new_line(l->extra, NULL);