ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/vexpress: Fix memory leak reported by Coverity 

As the conditional statement had to be split anyway, we can also
add a better error report message.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1426877963-3556-1-git-send-email-sw@weilnetz.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Stefan Weil 2015-04-01 17:57:29 +01:00 committed by Peter Maydell
parent 60ff4e63e2
commit db25a15817
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/vexpress.c
View File

@ -563,6 +563,7 @@ static void vexpress_common_init(MachineState *machine)
*/ */
if (bios_name) { if (bios_name) {
char *fn; char *fn;
int image_size;
if (drive_get(IF_PFLASH, 0, 0)) { if (drive_get(IF_PFLASH, 0, 0)) {
error_report("The contents of the first flash device may be " error_report("The contents of the first flash device may be "
@ -571,8 +572,14 @@ static void vexpress_common_init(MachineState *machine)
exit(1); exit(1);
} }
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (!fn || load_image_targphys(fn, map[VE_NORFLASH0], if (!fn) {
VEXPRESS_FLASH_SIZE) < 0) { 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); error_report("Could not load ROM image '%s'", bios_name);
exit(1); exit(1);
} }