diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2015-02-27 15:50:14 +0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2015-03-10 08:15:34 +0300 |
| commit | 6c5819c4d685bf5f3c81edb462f4d17fb99ca2b5 (patch) | |
| tree | 69db5ffef28dff3e0573317f47a0dd59dcac120d /hw/misc/macio/macio.c | |
| parent | d71cdbfd540d91a6ae0005e59abfd782c424b07a (diff) | |
| download | qemu-6c5819c4d685bf5f3c81edb462f4d17fb99ca2b5.tar.gz | |
macio: fix possible memory leak
If ret = macio_initfn_ide() is less than 0, the timer_memory
will leak the memory it points to.
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/misc/macio/macio.c')
| -rw-r--r-- | hw/misc/macio/macio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 9bc3f2d908..063ad80412 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -273,7 +273,7 @@ static int macio_newworld_initfn(PCIDevice *d) MacIOState *s = MACIO(d); NewWorldMacIOState *ns = NEWWORLD_MACIO(d); SysBusDevice *sysbus_dev; - MemoryRegion *timer_memory = g_new(MemoryRegion, 1); + MemoryRegion *timer_memory = NULL; int i; int cur_irq = 0; int ret = macio_common_initfn(d); @@ -301,6 +301,7 @@ static int macio_newworld_initfn(PCIDevice *d) } /* Timer */ + timer_memory = g_new(MemoryRegion, 1); memory_region_init_io(timer_memory, OBJECT(s), &timer_ops, NULL, "timer", 0x1000); memory_region_add_subregion(&s->bar, 0x15000, timer_memory); |