From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMJCX-0001jO-Pm for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMJCU-0002rP-Nj for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMJCU-0002rH-Go for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:42 -0500 From: Stefan Hajnoczi Date: Fri, 13 Feb 2015 16:24:37 +0000 Message-Id: <1423844701-21041-42-git-send-email-stefanha@redhat.com> In-Reply-To: <1423844701-21041-1-git-send-email-stefanha@redhat.com> References: <1423844701-21041-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 41/65] block: vmdk - fixed sizeof() error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jeff Cody , Stefan Hajnoczi From: Jeff Cody The size compared should be PATH_MAX, rather than sizeof(char *). Reported-by: Paolo Bonzini Signed-off-by: Jeff Cody Reviewed-by: Eric Blake Reviewed-by: Max Reitz Message-id: 46d873261433f4527e88885582f96942d61758d6.1423592487.git.jcody@redhat.com Signed-off-by: Stefan Hajnoczi --- block/vmdk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 7d079ad..8410a15 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -843,8 +843,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, } extent_path = g_malloc0(PATH_MAX); - path_combine(extent_path, sizeof(extent_path), - desc_file_path, fname); + path_combine(extent_path, PATH_MAX, desc_file_path, fname); extent_file = NULL; ret = bdrv_open(&extent_file, extent_path, NULL, NULL, bs->open_flags | BDRV_O_PROTOCOL, NULL, errp); -- 2.1.0