[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/7] set psize to 0 when romfile_loadfile failed
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v5 4/7] set psize to 0 when romfile_loadfile failed |
Date: |
Wed, 26 Jun 2013 17:15:02 +0800 |
Signed-off-by: Hu Tao <address@hidden>
---
src/romfile.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/romfile.c b/src/romfile.c
index ea71d1f..b1b89bb 100644
--- a/src/romfile.c
+++ b/src/romfile.c
@@ -51,28 +51,33 @@ romfile_loadfile(const char *name, int *psize)
{
struct romfile_s *file = romfile_find(name);
if (!file)
- return NULL;
+ goto failed;
int filesize = file->size;
if (!filesize)
- return NULL;
+ goto failed;
char *data = malloc_tmphigh(filesize+1);
if (!data) {
warn_noalloc();
- return NULL;
+ goto failed;
}
dprintf(5, "Copying romfile '%s' (len %d)\n", name, filesize);
int ret = file->copy(file, data, filesize);
if (ret < 0) {
free(data);
- return NULL;
+ goto failed;
}
if (psize)
*psize = filesize;
data[filesize] = '\0';
return data;
+
+failed:
+ if (psize)
+ *psize = 0;
+ return NULL;
}
// Attempt to load an integer from the given file - return 'defval'
--
1.8.3.1
- [Qemu-devel] [PATCH v5 04/14] Implement dimm device abstraction, (continued)
- [Qemu-devel] [PATCH v5 04/14] Implement dimm device abstraction, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 13/14] balloon: update with hotplugged memory, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 07/14] acpi_ich9 : Implement memory device hotplug registers, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 10/14] pc: Add dimm paravirt SRAT info, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 12/14] Implement "info memory" and "query-memory", Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 08/14] memory: record below_4g_mem_size, above_4g_mem_size, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 14/14] Implement dimm-info, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 0/7] support for ACPI memory hotplug, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 1/7] Add ACPI_EXTRACT_DEVICE* macros, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 2/7] Add SSDT memory device support, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 4/7] set psize to 0 when romfile_loadfile failed,
Hu Tao <=
- [Qemu-devel] [PATCH v5 3/7] acpi-dsdt: Implement functions for memory hotplug, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 6/7] q35: Add memory hotplug handler, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 7/7] pci: Use paravirt interface for pcimem_start and pcimem64_start, Hu Tao, 2013/06/26
- [Qemu-devel] [PATCH v5 5/7] acpi: generate hotplug memory devices, Hu Tao, 2013/06/26