cfdisk: fix memory leak and possible NULL dereference [gcc-analyzer]

karelzak · karelzak · commit 9a918daa4861 · 2025-04-07T14:16:17.000+02:00
Signed-off-by: Karel Zak <kzak@redhat.com> (cherry picked from commit 33ca468)
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
@@ -947,6 +947,7 @@ static void menu_set_title(struct cfdisk_menu *m, const char *title)
 			m->width = len + MENU_TITLE_PADDING;
 		str = xstrdup(title);
 	}
+	free(m->title);
 	m->title = str;
 }
 
@@ -2173,7 +2174,8 @@ static int ui_create_label(struct cfdisk *cf)
 	nitems = fdisk_get_nlabels(cf->cxt);
 	cm = xcalloc(nitems + 1, sizeof(struct cfdisk_menuitem));
 
-	while (fdisk_next_label(cf->cxt, &lb) == 0) {
+	while (fdisk_next_label(cf->cxt, &lb) == 0 && i < nitems) {
+
 		if (fdisk_label_is_disabled(lb) ||
 		    fdisk_label_get_type(lb) == FDISK_DISKLABEL_BSD)
 			continue;
