From: Karel Zak <kzak@redhat.com>
Date: Wed, 18 Aug 2021 09:28:43 +0000 (+0200)
Subject: libfdisk: make self_partition() use more robust [gcc-analyzer]
X-Git-Tag: v2.38-rc1~286
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58b43e4b4f2268b08cfdf743fda2ea231fd01947;p=thirdparty%2Futil-linux.git

libfdisk: make self_partition() use more robust [gcc-analyzer]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 6c7a655a76..98bc61409a 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1944,8 +1944,7 @@ static int dos_add_partition(struct fdisk_context *cxt,
 	for (i = 0; i < 4; i++) {
 		struct dos_partition *p = self_partition(cxt, i);
 
-		assert(p);
-		if (is_used_partition(p)) {
+		if (p && is_used_partition(p)) {
 			fdisk_sector_t start = dos_partition_get_start(p);
 			if (first + grain <= start)
 				free_sectors = 1;
@@ -2340,6 +2339,7 @@ static int dos_set_partition(struct fdisk_context *cxt, size_t n,
 
 	l = self_label(cxt);
 	p = self_partition(cxt, n);
+	assert(p);
 
 	pe = self_pte(cxt, n);
 	if (!pe)
@@ -2773,6 +2773,7 @@ static int dos_toggle_partition_flag(
 		return -EINVAL;
 
 	p = self_partition(cxt, i);
+	assert(p);
 
 	switch (flag) {
 	case DOS_FLAG_ACTIVE: