From 5bdf61fdd76b5ca7101353abbdbcd1ed692fa9e2 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Mon, 6 Dec 2010 15:25:35 +0100 Subject: Use qemu_mallocz() instead of calloc() in img_convert() Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf --- qemu-img.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'qemu-img.c') diff --git a/qemu-img.c b/qemu-img.c index fa77ac0db..eca99c4a5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -699,11 +699,7 @@ static int img_convert(int argc, char **argv) return 1; } - bs = calloc(bs_n, sizeof(BlockDriverState *)); - if (!bs) { - error("Out of memory"); - return 1; - } + bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *)); total_sectors = 0; for (bs_i = 0; bs_i < bs_n; bs_i++) { @@ -983,7 +979,7 @@ out: bdrv_delete(bs[bs_i]); } } - free(bs); + qemu_free(bs); if (ret) { return 1; } -- cgit v1.2.3-65-gdbad