summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2019-11-27 11:17:15 -0600
committerDavid Teigland <teigland@redhat.com>2019-11-27 11:17:15 -0600
commit5a88b2ce7fcdffec909f7f236d9bcfe0a615b6b9 (patch)
tree66a9a54d9cff93d3d877f01b2eb7f23c0e178027
parent3145a855836c4cf50d4b6064b3e6f1ce4a366aad (diff)
downloadlvm2-5a88b2ce7fcdffec909f7f236d9bcfe0a615b6b9.tar.gz
pvck: use zalloc in more places
-rw-r--r--tools/pvck.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/pvck.c b/tools/pvck.c
index cc23d9ba4..4eaf8b475 100644
--- a/tools/pvck.c
+++ b/tools/pvck.c
@@ -226,11 +226,9 @@ static void _copy_out_metadata(char *buf, uint32_t start, uint32_t first_start,
/* terminating 0 byte */
new_len++;
- if (!(new_buf = malloc(new_len)))
+ if (!(new_buf = zalloc(new_len)))
return;
- memset(new_buf, 0, new_len);
-
if (len_a) {
memcpy(new_buf, buf+start, len_a);
memcpy(new_buf+len_a, buf+512, len_b);
@@ -752,9 +750,8 @@ static int _dump_meta_area(struct device *dev, const char *tofile,
if (!tofile)
return_0;
- if (!(meta_buf = malloc(mda_size)))
+ if (!(meta_buf = zalloc(mda_size)))
return_0;
- memset(meta_buf, 0, mda_size);
if (!dev_read_bytes(dev, mda_offset, mda_size, meta_buf)) {
log_print("CHECK: failed to read metadata area at offset %llu size %llu",
@@ -2468,9 +2465,8 @@ static int _backup_file_to_raw_metadata(char *back_buf, uint64_t back_size,
text_max = back_size * 2;
- if (!(text_buf = malloc(text_max)))
+ if (!(text_buf = zalloc(text_max)))
return_0;
- memset(text_buf, 0, text_max);
p = back_buf;
text_pos = 0;