From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS8t-0002EM-6a for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCS8r-0000ST-7A for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS8r-0000Rr-2G for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:29 -0400 From: Stefan Hajnoczi Date: Tue, 7 Jul 2015 13:38:17 +0100 Message-Id: <1436272705-28499-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1436272705-28499-1-git-send-email-stefanha@redhat.com> References: <1436272705-28499-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.4 1/9] rocker: fix memory leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Gonglei , Stefan Hajnoczi From: Gonglei Meanwhile, using g_new0 instead of g_malloc0, refer to commit 5839e53. Signed-off-by: Gonglei Message-id: 1435213450-6700-1-git-send-email-arei.gonglei@huawei.com Signed-off-by: Stefan Hajnoczi --- hw/net/rocker/rocker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 4d25842..7e06015 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -96,7 +96,7 @@ World *rocker_get_world(Rocker *r, enum rocker_world_type type) RockerSwitch *qmp_query_rocker(const char *name, Error **errp) { - RockerSwitch *rocker = g_malloc0(sizeof(*rocker)); + RockerSwitch *rocker; Rocker *r; r = rocker_find(name); @@ -106,6 +106,7 @@ RockerSwitch *qmp_query_rocker(const char *name, Error **errp) return NULL; } + rocker = g_new0(RockerSwitch, 1); rocker->name = g_strdup(r->name); rocker->id = r->switch_id; rocker->ports = r->fp_ports; -- 2.4.3