diff options
| author | Karel Zak | 2015-01-29 10:49:51 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-01-29 10:49:51 +0100 |
| commit | edc4cf94a86cda2f5476a7be98453ee027820913 (patch) | |
| tree | f233ab2eb7414fb88db61dd54b8c128b8f98834c /libfdisk/src/partition.c | |
| parent | libfdisk: (gpt) check return from GUID parser [coverity scan] (diff) | |
| download | kernel-qcow2-util-linux-edc4cf94a86cda2f5476a7be98453ee027820913.tar.gz kernel-qcow2-util-linux-edc4cf94a86cda2f5476a7be98453ee027820913.tar.xz kernel-qcow2-util-linux-edc4cf94a86cda2f5476a7be98453ee027820913.zip | |
libfdisk: make fdisk_partition_to_string() more robust [coverity scan]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/partition.c')
| -rw-r--r-- | libfdisk/src/partition.c | 13 |
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; } |