From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 18 Jan 2016 10:25:45 +0000 (+0100)
Subject: qemu-char: avoid leak in qemu_chr_open_pp_fd
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=27ef9cb0e77eda46618ea084adffa63ebde5be80;p=qemu.git

qemu-char: avoid leak in qemu_chr_open_pp_fd

drv leaks if qemu_chr_alloc returns an error.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/qemu-char.c b/qemu-char.c
index b9e5547ce1..ca53e8c376 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1740,18 +1740,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;
 }