From dc65271b8112f7821d5aedde16c8fa7a95dcc0ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 9 May 2019 15:55:14 +0200 Subject: [PATCH] cmd: gpt: remove bogus code leftover from merge conflict resolution and fix leaking memory for str_disk_guid in case of error. --- common/cmd_gpt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/cmd_gpt.c b/common/cmd_gpt.c index 1feb41d93c..f401209f7f 100644 --- a/common/cmd_gpt.c +++ b/common/cmd_gpt.c @@ -141,7 +141,6 @@ static int set_gpt_info(block_dev_desc_t *dev_desc, char *val, *p; int p_count; disk_partition_t *parts; - char *guid_str; int errno = 0; uint64_t size_ll, start_ll; @@ -259,7 +258,6 @@ static int set_gpt_info(block_dev_desc_t *dev_desc, } } - *str_disk_guid = guid_str; *parts_count = p_count; *partitions = parts; free(str); @@ -267,10 +265,8 @@ static int set_gpt_info(block_dev_desc_t *dev_desc, return 0; err: + free(*str_disk_guid); free(parts); -free_guid: - free(guid_str); -free_str: free(str); *str_disk_guid = NULL; -- 2.39.2