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

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>
This commit is contained in:
Gonglei 2015-02-27 15:50:14 +08:00 committed by Michael Tokarev
parent d71cdbfd54
commit 6c5819c4d6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/misc/macio/macio.c
View File

@ -273,7 +273,7 @@ static int macio_newworld_initfn(PCIDevice *d)
MacIOState *s = MACIO(d); MacIOState *s = MACIO(d);
NewWorldMacIOState *ns = NEWWORLD_MACIO(d); NewWorldMacIOState *ns = NEWWORLD_MACIO(d);
SysBusDevice *sysbus_dev; SysBusDevice *sysbus_dev;
MemoryRegion *timer_memory = g_new(MemoryRegion, 1); MemoryRegion *timer_memory = NULL;
int i; int i;
int cur_irq = 0; int cur_irq = 0;
int ret = macio_common_initfn(d); int ret = macio_common_initfn(d);
@ -301,6 +301,7 @@ static int macio_newworld_initfn(PCIDevice *d)
} }
/* Timer */ /* Timer */
timer_memory = g_new(MemoryRegion, 1);
memory_region_init_io(timer_memory, OBJECT(s), &timer_ops, NULL, "timer", memory_region_init_io(timer_memory, OBJECT(s), &timer_ops, NULL, "timer",
0x1000); 0x1000);
memory_region_add_subregion(&s->bar, 0x15000, timer_memory); memory_region_add_subregion(&s->bar, 0x15000, timer_memory);