From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZ28t-0000IP-SF for qemu-devel@nongnu.org; Fri, 20 Mar 2015 14:59:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZ28s-0003y8-UL for qemu-devel@nongnu.org; Fri, 20 Mar 2015 14:59:35 -0400 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:33873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZ28s-0003y3-Og for qemu-devel@nongnu.org; Fri, 20 Mar 2015 14:59:34 -0400 From: Stefan Weil Date: Fri, 20 Mar 2015 19:59:23 +0100 Message-Id: <1426877963-3556-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH v2] hw/arm/vexpress: Fix memory leak reported by Coverity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developer Cc: Peter Maydell , Stefan Weil As the conditional statement had to be split anyway, we can also add a better error report message. Signed-off-by: Stefan Weil --- v2: Fix commit message. Thank you to Eric Blake for his hint. hw/arm/vexpress.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index e9a7ced..dd04527 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -563,6 +563,7 @@ static void vexpress_common_init(MachineState *machine) */ if (bios_name) { char *fn; + int image_size; if (drive_get(IF_PFLASH, 0, 0)) { error_report("The contents of the first flash device may be " @@ -571,8 +572,14 @@ static void vexpress_common_init(MachineState *machine) exit(1); } fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (!fn || load_image_targphys(fn, map[VE_NORFLASH0], - VEXPRESS_FLASH_SIZE) < 0) { + if (!fn) { + error_report("Could not find ROM image '%s'", bios_name); + exit(1); + } + image_size = load_image_targphys(fn, map[VE_NORFLASH0], + VEXPRESS_FLASH_SIZE); + g_free(fn); + if (image_size < 0) { error_report("Could not load ROM image '%s'", bios_name); exit(1); } -- 1.7.10.4