diff options
author | Stefan Weil <sw@weilnetz.de> | 2015-04-01 17:57:29 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-01 17:57:29 +0100 |
commit | 4de9a883be653f02f8c1d5dcd1066f614d9606b6 (patch) | |
tree | 26f259d43bc4bae783ea73addb32bbfa1fdcd076 /hw/arm | |
parent | db25a15817f98c46c5f0eea4f414249d8fbb96b1 (diff) | |
download | qemu-4de9a883be653f02f8c1d5dcd1066f614d9606b6.zip qemu-4de9a883be653f02f8c1d5dcd1066f614d9606b6.tar.gz qemu-4de9a883be653f02f8c1d5dcd1066f614d9606b6.tar.bz2 |
hw/arm/virt: 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: 1426877982-3603-1-git-send-email-sw@weilnetz.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
-rw-r--r-- | hw/arm/virt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b652b07..7d082e2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -553,6 +553,7 @@ static void create_flash(const VirtBoardInfo *vbi) 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 " @@ -561,7 +562,13 @@ static void create_flash(const VirtBoardInfo *vbi) exit(1); } fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (!fn || load_image_targphys(fn, flashbase, flashsize) < 0) { + if (!fn) { + error_report("Could not find ROM image '%s'", bios_name); + exit(1); + } + image_size = load_image_targphys(fn, flashbase, flashsize); + g_free(fn); + if (image_size < 0) { error_report("Could not load ROM image '%s'", bios_name); exit(1); } |