From patchwork Wed Sep 3 06:35:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 385403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 23D90140219 for ; Wed, 3 Sep 2014 16:36:39 +1000 (EST) Received: from localhost ([::1]:42618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4BJ-0002tP-0L for incoming@patchwork.ozlabs.org; Wed, 03 Sep 2014 02:36:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4AT-0001Ob-Sg for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:35:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP4AL-0005bW-PK for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:35:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:41543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP4AL-0005bE-Ed; Wed, 03 Sep 2014 02:35:37 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7DA7840760; Wed, 3 Sep 2014 10:35:36 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 68E6A6E9; Wed, 3 Sep 2014 10:35:36 +0400 (MSK) Received: (nullmailer pid 1616 invoked by uid 1000); Wed, 03 Sep 2014 06:35:36 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Sep 2014 10:35:32 +0400 Message-Id: <1409726135-1547-8-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1409726135-1547-1-git-send-email-mjt@tls.msk.ru> References: <1409726135-1547-1-git-send-email-mjt@tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Chen Fan , qemu-trivial@nongnu.org, Michael Tokarev Subject: [Qemu-devel] [PULL 07/10] query-memdev: fix potential memory leaks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Fan Signed-off-by: Chen Fan Reviewed-by: Peter Crosthwaite Reviewed-by: Hu Tao Signed-off-by: Michael Tokarev --- numa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/numa.c b/numa.c index c78cec9..aa772aa 100644 --- a/numa.c +++ b/numa.c @@ -318,10 +318,11 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, static int query_memdev(Object *obj, void *opaque) { MemdevList **list = opaque; + MemdevList *m = NULL; Error *err = NULL; if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { - MemdevList *m = g_malloc0(sizeof(*m)); + m = g_malloc0(sizeof(*m)); m->value = g_malloc0(sizeof(*m->value)); @@ -369,6 +370,9 @@ static int query_memdev(Object *obj, void *opaque) return 0; error: + g_free(m->value); + g_free(m); + return -1; }