From: Fam Zheng Date: Wed, 3 Dec 2014 23:28:31 +0000 (+0800) Subject: vmdk: Clean up descriptor file reading X-Git-Tag: v2.7.1~1367^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=73b7bcad439e0edaced05049897090cc10d84b5b;p=mirror_qemu.git vmdk: Clean up descriptor file reading Zeroing a buffer that will be filled right after is not necessary, and allocating a power of two + 1 is naughty. Suggested-by: Markus Armbruster Signed-off-by: Fam Zheng Reviewed-by: Don Koch Reviewed-by: Markus Armbruster Reviewed-by: Max Reitz Message-id: 1417649314-13704-4-git-send-email-famz@redhat.com Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- diff --git a/block/vmdk.c b/block/vmdk.c index 4ee0aed8d0..5f43226b35 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -557,8 +557,8 @@ static char *vmdk_read_desc(BlockDriverState *file, uint64_t desc_offset, return NULL; } - size = MIN(size, 1 << 20); /* avoid unbounded allocation */ - buf = g_malloc0(size + 1); + size = MIN(size, (1 << 20) - 1); /* avoid unbounded allocation */ + buf = g_malloc(size + 1); ret = bdrv_pread(file, desc_offset, buf, size); if (ret < 0) { @@ -566,6 +566,7 @@ static char *vmdk_read_desc(BlockDriverState *file, uint64_t desc_offset, g_free(buf); return NULL; } + buf[ret] = 0; return buf; }