[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/47] macio: fix possible memory leak
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 31/47] macio: fix possible memory leak |
Date: |
Wed, 4 Mar 2015 20:06:48 +0300 |
From: Gonglei <address@hidden>
If ret = macio_initfn_ide() is less than 0, the timer_memory
will leak the memory it points to.
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/misc/macio/macio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index e0f1e88..bf96844 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);
--
2.1.4
- [Qemu-devel] [PULL 20/47] tpm: Remove superfluous '\n' around error_report(), (continued)
- [Qemu-devel] [PULL 20/47] tpm: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 26/47] qapi-schema: Fix SpiceChannel docs, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 42/47] oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 01/47] xen-pt: fix Negative array index read, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 14/47] pl330.c: remove superfluous '\n' around error_setg, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 07/47] qemu-options: fix/document -incoming options, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 18/47] vfio: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 45/47] milkymist-pfpu: fix GCC 5.0.0 aggressive-loop-optimizations warning, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 22/47] vhost: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 33/47] sysbus: fix memory leak, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 31/47] macio: fix possible memory leak,
Michael Tokarev <=
- [Qemu-devel] [PULL 44/47] fix GCC 5.0.0 logical-not-parentheses warnings, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 38/47] vhost_net: Add missing 'static' attribute, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 24/47] ui/vnc: Remove vnc_stop_worker_thread(), Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 34/47] microblaze: fix memory leak, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 29/47] nbd: fix resource leak, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 35/47] gitignore: Track common.env in iotests gitignore, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 23/47] ui: Removed unused functions, Michael Tokarev, 2015/03/04
- [Qemu-devel] [PULL 41/47] disas/microblaze: Fix warnings caused by missing 'static' attribute, Michael Tokarev, 2015/03/04