summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libfdisk/src/partition.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index ba9f597a3..9a02993c3 100644
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -661,7 +661,7 @@ int fdisk_partition_to_string(struct fdisk_partition *pa,
int rc = 0;
uint64_t x;
- if (!pa || !cxt)
+ if (!pa || !cxt || !data)
return -EINVAL;
switch (id) {
@@ -762,13 +762,16 @@ int fdisk_partition_to_string(struct fdisk_partition *pa,
return -EINVAL;
}
- if (rc < 0)
+ if (rc < 0) {
rc = -ENOMEM;
- else if (rc > 0)
+ free(p);
+ p = NULL;
+
+ } else if (rc > 0)
rc = 0;
- if (data)
- *data = p;
+ *data = p;
+
return rc;
}