From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQEbb-00021u-Su for qemu-devel@nongnu.org; Wed, 19 Mar 2014 07:24:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQEbS-00084V-W7 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 07:24:19 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:59785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQEbS-00084I-N9 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 07:24:10 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Mar 2014 11:24:09 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9CB0717D8063 for ; Wed, 19 Mar 2014 11:24:50 +0000 (GMT) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2JBNtYL2752932 for ; Wed, 19 Mar 2014 11:23:56 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2JBO7PZ002158 for ; Wed, 19 Mar 2014 05:24:07 -0600 From: Christian Borntraeger Date: Wed, 19 Mar 2014 12:24:27 +0100 Message-Id: <1395228267-34202-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PATCHv2] vl.c: Fix memory leak in qemu_register_machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Christian Borntraeger , "Michael S. Tsirkin" , "qemu-devel@nongnu.org" , =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , Marcel Apfelbaum 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 729 ==54082== at 0x4031AFE: malloc (vg_replace_malloc.c:292) ==54082== by 0x4145569: g_malloc (in /usr/lib64/libglib-2.0.so.0.3400.2) ==54082== by 0x415F9E9: g_strconcat (in /usr/lib64/libglib-2.0.so.0.3400.2) ==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 --- 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 *data) 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, }; type_register(&ti); + g_free(name); return 0; } -- 1.8.4.2