From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL70Y-0006x5-Sp for qemu-devel@nongnu.org; Mon, 18 Jan 2016 05:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aL70U-0002We-S1 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 05:25:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aL70U-0002WY-N4 for qemu-devel@nongnu.org; Mon, 18 Jan 2016 05:25:54 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id EE0EE746 for ; Mon, 18 Jan 2016 10:25:53 +0000 (UTC) From: Paolo Bonzini Date: Mon, 18 Jan 2016 11:25:51 +0100 Message-Id: <1453112751-725-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-char: avoid leak in qemu_chr_open_pp_fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org drv leaks if qemu_chr_alloc returns an error. Signed-off-by: Paolo Bonzini --- qemu-char.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 9e2217b..2633b8a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1778,18 +1778,19 @@ static CharDriverState *qemu_chr_open_pp_fd(int fd, return NULL; } - drv = g_new0(ParallelCharDriver, 1); - drv->fd = fd; - drv->mode = IEEE1284_MODE_COMPAT; - chr = qemu_chr_alloc(backend, errp); if (!chr) { return NULL; } + + drv = g_new0(ParallelCharDriver, 1); + chr->opaque = drv; chr->chr_write = null_chr_write; chr->chr_ioctl = pp_ioctl; chr->chr_close = pp_close; - chr->opaque = drv; + + drv->fd = fd; + drv->mode = IEEE1284_MODE_COMPAT; return chr; } -- 2.5.0