[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL for-2.0 1/7] vl.c: Fix memory leak in qemu_register_m

From: Andreas Färber
Subject: [Qemu-devel] [PULL for-2.0 1/7] vl.c: Fix memory leak in qemu_register_machine()
Date: Wed, 19 Mar 2014 22:45:36 +0100

From: Christian Borntraeger <address@hidden>

Since commit 261747f176f6 (vl: Use MachineClass instead of global
QEMUMachine list) valgrind complains about the following:

==54082== 57 bytes in 3 blocks are definitely lost in loss record 365 of
==54082==    at 0x4031AFE: malloc (vg_replace_malloc.c:292)
==54082==    by 0x4145569: g_malloc (in
==54082==    by 0x415F9E9: g_strconcat (in
==54082==    by 0x80157FE7: qemu_register_machine (vl.c:1597)
==54082==    by 0x80208E6B: module_call_init (module.c:105)
==54082==    by 0x80013B91: main (vl.c:3000)

Turns out that valgrind is right. We simply forget the memory that
g_strconcat() has allocated. Lets free it after the type_register().
We need a 2nd variable due to constness of the name part of the
type structure.

Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
 vl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index f0fe48b..0e82f06 100644
--- a/vl.c
+++ b/vl.c
@@ -1587,14 +1587,16 @@ static void machine_class_init(ObjectClass *oc, void 
 int qemu_register_machine(QEMUMachine *m)
+    char *name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL);
     TypeInfo ti = {
-        .name       = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL),
+        .name       = name,
         .parent     = TYPE_MACHINE,
         .class_init = machine_class_init,
         .class_data = (void *)m,
+    g_free(name);
     return 0;

reply via email to

[Prev in Thread] Current Thread [Next in Thread]