From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 22 May 2019 18:45:54 +0000 (+0100)
Subject: libfdisk: assert if self_pte() returns NULL
X-Git-Tag: v2.34-rc2~35
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Futil-linux.git;a=commitdiff_plain;h=620851e0cc297c2caadf9d4480028e181d8963ee

libfdisk: assert if self_pte() returns NULL

The self_pte() can return NULL if partitions array is not large enough,
but that should also be impossible and definitely a bug.

libfdisk/src/dos.c:984:8: warning: potential null pointer dereference [-Wnull-dereference]
libfdisk/src/dos.c:1031:8: warning: potential null pointer dereference [-Wnull-dereference]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 40b9aa758c..6dc276e8a6 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -978,6 +978,8 @@ static int find_last_free_sector_in_range(
 		last_moved = 0;
 		for ( ; i < cxt->label->nparts_max; i++) {
 			struct pte *pe = self_pte(cxt, i);
+
+			assert(pe);
 			fdisk_sector_t p_start = get_abs_partition_start(pe);
 			fdisk_sector_t p_end = get_abs_partition_end(pe);
 
@@ -1025,6 +1027,8 @@ static int find_first_free_sector_in_range(
 		first_moved = 0;
 		for (; i < cxt->label->nparts_max; i++) {
 			struct pte *pe = self_pte(cxt, i);
+
+			assert(pe);
 			fdisk_sector_t p_start = get_abs_partition_start(pe);
 			fdisk_sector_t p_end = get_abs_partition_end(pe);