From a67054f9be6998cd111ab81e4ca8931128569f56 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 18 May 2016 14:15:02 +0200 Subject: libfdisk: make table-length usage more robust Signed-off-by: Karel Zak --- libfdisk/src/gpt.c | 2 ++ libfdisk/src/script.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'libfdisk') diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index ff435e3ea..eaa9f4803 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -2503,6 +2503,8 @@ int fdisk_gpt_set_npartitions(struct fdisk_context *cxt, unsigned long new) gpt = self_label(cxt); old = le32_to_cpu(gpt->pheader->npartition_entries); + if (old == new) + return 0; /* do nothing, say nothing */ /* calculate the size (bytes) of the entries array */ new_size = new * le32_to_cpu(gpt->pheader->sizeof_partition_entry); diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c index fd05bf703..75e1b52de 100644 --- a/libfdisk/src/script.c +++ b/libfdisk/src/script.c @@ -1346,10 +1346,15 @@ int fdisk_apply_script_headers(struct fdisk_context *cxt, struct fdisk_script *d return rc; str = fdisk_script_get_header(dp, "table-length"); - if (str) - return fdisk_gpt_set_npartitions(cxt, strtoul(str, NULL, 0)); + if (str) { + uintmax_t sz; - return 0; + rc = parse_size(str, &sz, NULL); + if (rc == 0) + rc = fdisk_gpt_set_npartitions(cxt, sz); + } + + return rc; } /** -- cgit v1.2.3-55-g7522