diff options
| author | Karel Zak | 2015-03-27 13:47:13 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-03-27 13:47:13 +0100 |
| commit | 7298680365d7aa3c0e736e7e5db435aae865da6f (patch) | |
| tree | c0fc6c2a5b1dc86b25fbbfbbdec7d3b044e6a63e /libfdisk/src/partition.c | |
| parent | build-sys: add HAVE_LIBMOUNT (diff) | |
| download | kernel-qcow2-util-linux-7298680365d7aa3c0e736e7e5db435aae865da6f.tar.gz kernel-qcow2-util-linux-7298680365d7aa3c0e736e7e5db435aae865da6f.tar.xz kernel-qcow2-util-linux-7298680365d7aa3c0e736e7e5db435aae865da6f.zip | |
libfdisk: don't return empty strings from fdisk_partition_to_string()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/partition.c')
| -rw-r--r-- | libfdisk/src/partition.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index 03c0eb5e4..640cd5a1d 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -825,19 +825,19 @@ int fdisk_partition_to_string(struct fdisk_partition *pa, rc = asprintf(&p, "%x", fdisk_parttype_get_code(pa->type)); break; case FDISK_FIELD_UUID: - p = pa->uuid ? strdup(pa->uuid) : NULL; + p = pa->uuid && *pa->uuid? strdup(pa->uuid) : NULL; break; case FDISK_FIELD_NAME: - p = pa->name ? strdup(pa->name) : NULL; + p = pa->name && *pa->name ? strdup(pa->name) : NULL; break; case FDISK_FIELD_ATTR: - p = pa->attrs ? strdup(pa->attrs) : NULL; + p = pa->attrs && *pa->attrs ? strdup(pa->attrs) : NULL; break; case FDISK_FIELD_SADDR: - p = pa->start_chs ? strdup(pa->start_chs) : NULL; + p = pa->start_chs && *pa->start_chs ? strdup(pa->start_chs) : NULL; break; case FDISK_FIELD_EADDR: - p = pa->end_chs ? strdup(pa->end_chs) : NULL; + p = pa->end_chs && *pa->end_chs? strdup(pa->end_chs) : NULL; break; default: return -EINVAL; |