* [Qemu-devel] [PATCH] xen_console: fix memory leak
@ 2011-06-24 15:59 stefano.stabellini
2011-06-30 15:09 ` Alexander Graf
0 siblings, 1 reply; 2+ messages in thread
From: stefano.stabellini @ 2011-06-24 15:59 UTC (permalink / raw)
To: qemu-devel; +Cc: xen-devel, agraf, Stefano Stabellini
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
con_init leaks the string "type", fix it.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
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)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] xen_console: fix memory leak
2011-06-24 15:59 [Qemu-devel] [PATCH] xen_console: fix memory leak stefano.stabellini
@ 2011-06-30 15:09 ` Alexander Graf
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Graf @ 2011-06-30 15:09 UTC (permalink / raw)
To: stefano.stabellini; +Cc: xen-devel, qemu-devel
On 06/24/2011 05:59 PM, stefano.stabellini@eu.citrix.com wrote:
> From: Stefano Stabellini<stefano.stabellini@eu.citrix.com>
>
> con_init leaks the string "type", fix it.
Thanks, applied to xen-next branch.
Alex
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-30 15:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-24 15:59 [Qemu-devel] [PATCH] xen_console: fix memory leak stefano.stabellini
2011-06-30 15:09 ` Alexander Graf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).