lsblk: fix null pointer dereferences

Both catched with -Wnull-dereference compiler option: Signed-off-by: Sami Kerola <[email protected]>
openfans-community-offical · Dec 10, 2018 · e361253 · e361253
1 parent 2859592
commit e361253
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/misc-utils/lsblk-devtree.c b/misc-utils/lsblk-devtree.c
@@ -203,7 +203,8 @@ int lsblk_device_is_last_parent(struct lsblk_device *dev, struct lsblk_device *p
 	struct lsblk_devdep *dp = list_last_entry(
 					&dev->parents,
 					struct lsblk_devdep, ls_parents);
-
+	if (!dp)
+		return 0;
 	return dp->parent == parent;
 }
 

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
@@ -747,15 +747,15 @@ static char *device_get_data(
 	case COL_OWNER:
 	{
 		struct stat *st = device_get_stat(dev);
-		struct passwd *pw = st ? NULL : getpwuid(st->st_uid);
+		struct passwd *pw = st ? getpwuid(st->st_uid) : NULL;
 		if (pw)
 			str = xstrdup(pw->pw_name);
 		break;
 	}
 	case COL_GROUP:
 	{
 		struct stat *st = device_get_stat(dev);
-		struct group *gr = st ? NULL : getgrgid(st->st_gid);
+		struct group *gr = st ? getgrgid(st->st_gid) : NULL;
 		if (gr)
 			str = xstrdup(gr->gr_name);
 		break;