From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Mon, 14 Aug 2017 10:57:52 +0000 (+0200)
Subject: libfdisk: fix two potential memory errors.
X-Git-Tag: v2.31-rc1~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cebb2ab33e4b5a802e8d711b9001c9d717ec9c3;p=thirdparty%2Futil-linux.git

libfdisk: fix two potential memory errors.

Fixes one leak and one unchecked allocation error.

[kzak@redhat.com: - don't call fdisk_ask_menu_get_result()
                    after failed fdisk_do_ask()]

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

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 1e0480ea1f..9759ce2e0a 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1737,10 +1737,11 @@ static int dos_add_partition(struct fdisk_context *cxt,
 			fdisk_ask_menu_add_item(ask, 'l', _("logical"), _("numbered from 5"));
 
 		rc = fdisk_do_ask(cxt, ask);
+		if (!rc)
+			fdisk_ask_menu_get_result(ask, &c);
+		fdisk_unref_ask(ask);
 		if (rc)
 			return rc;
-		fdisk_ask_menu_get_result(ask, &c);
-		fdisk_unref_ask(ask);
 
 		if (c == 'p') {
 			rc = get_partition_unused_primary(cxt, pa, &res);
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 73590156e7..3a9d51da1e 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -2302,6 +2302,8 @@ static int gpt_add_partition(
 				ask = fdisk_new_ask();
 			else
 				fdisk_reset_ask(ask);
+			if (!ask)
+				return -ENOMEM;
 
 			/* First sector */
 			fdisk_ask_set_query(ask, _("First sector"));