From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvi3K-0006iN-JN for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xvi3E-0003yj-DB for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvi3E-0003yX-5p for qemu-devel@nongnu.org; Tue, 02 Dec 2014 02:39:12 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB27dB7C024640 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 2 Dec 2014 02:39:11 -0500 From: Fam Zheng Date: Tue, 2 Dec 2014 15:39:14 +0800 Message-Id: <1417505957-2666-4-git-send-email-famz@redhat.com> In-Reply-To: <1417505957-2666-1-git-send-email-famz@redhat.com> References: <1417505957-2666-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.3 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 , Markus Armbruster , Stefan Hajnoczi 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 --- block/vmdk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 28d22db..0c5769c 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -558,14 +558,15 @@ static char *vmdk_read_desc(BlockDriverState *file, uint64_t desc_offset, } size = MIN(size, 1 << 20); /* avoid unbounded allocation */ - buf = g_malloc0(size + 1); + buf = g_malloc(size); - ret = bdrv_pread(file, desc_offset, buf, size); + ret = bdrv_pread(file, desc_offset, buf, size - 1); if (ret < 0) { error_setg_errno(errp, -ret, "Could not read from file"); g_free(buf); return NULL; } + buf[ret - 1] = 0; return buf; } -- 1.9.3