From patchwork Fri Jun 24 15:59:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 101824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05C49B6F86 for ; Sat, 25 Jun 2011 02:04:46 +1000 (EST) Received: from localhost ([::1]:59023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa8s6-0004WU-M4 for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 12:04:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa8jM-0002zx-Fz for qemu-devel@nongnu.org; Fri, 24 Jun 2011 11:55:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa8jK-0005PQ-Ff for qemu-devel@nongnu.org; Fri, 24 Jun 2011 11:55:40 -0400 Received: from smtp.citrix.com ([66.165.176.89]:40344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa8jK-0005PM-0W for qemu-devel@nongnu.org; Fri, 24 Jun 2011 11:55:38 -0400 X-IronPort-AV: E=Sophos;i="4.65,419,1304308800"; d="scan'208";a="14785432" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 24 Jun 2011 11:55:36 -0400 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.137.0; Fri, 24 Jun 2011 11:55:35 -0400 Received: from localhost.localdomain (kaball.uk.xensource.com [10.80.2.59]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id p5OFtRvT024626; Fri, 24 Jun 2011 08:55:28 -0700 From: To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 16:59:46 +0100 Message-ID: <1308931186-11387-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: xen-devel@lists.xensource.com, agraf@suse.de, Stefano Stabellini Subject: [Qemu-devel] [PATCH] xen_console: fix memory leak 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: Stefano Stabellini con_init leaks the string "type", fix it. Signed-off-by: Stefano Stabellini --- hw/xen_console.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/xen_console.c b/hw/xen_console.c index e88714f..519d5f5 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -180,6 +180,7 @@ static int con_init(struct XenDevice *xendev) { struct XenConsole *con = container_of(xendev, struct XenConsole, xendev); char *type, *dom; + int ret = 0; /* setup */ dom = xs_get_domain_path(xenstore, con->xendev.dom); @@ -189,7 +190,8 @@ static int con_init(struct XenDevice *xendev) type = xenstore_read_str(con->console, "type"); if (!type || strcmp(type, "ioemu") != 0) { xen_be_printf(xendev, 1, "not for me (type=%s)\n", type); - return -1; + ret = -1; + goto out; } if (!serial_hds[con->xendev.dev]) @@ -198,7 +200,9 @@ static int con_init(struct XenDevice *xendev) else con->chr = serial_hds[con->xendev.dev]; - return 0; +out: + qemu_free(type); + return ret; } static int con_initialise(struct XenDevice *xendev)