From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwJLn-00087D-V5 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:28:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwJLj-000872-Cf for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:28:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwJLj-00086m-5z for qemu-devel@nongnu.org; Wed, 03 Dec 2014 18:28:47 -0500 From: Fam Zheng Date: Thu, 4 Dec 2014 07:28:31 +0800 Message-Id: <1417649314-13704-4-git-send-email-famz@redhat.com> In-Reply-To: <1417649314-13704-1-git-send-email-famz@redhat.com> References: <1417649314-13704-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 3/6] vmdk: Clean up descriptor file reading List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Don Koch , Markus Armbruster , Stefan Hajnoczi , Max Reitz 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 --- block/vmdk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 4ee0aed..5f43226 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; } -- 1.9.3