From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YX4f2-0007YX-Be for qemu-devel@nongnu.org; Sun, 15 Mar 2015 05:16:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YX4ex-0003vn-7q for qemu-devel@nongnu.org; Sun, 15 Mar 2015 05:16:40 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Sun, 15 Mar 2015 10:16:28 +0100 Message-Id: <1426410988-3695-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3] vl: fix resource leak with monitor_fdset_add_fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, armbru@redhat.com, zhaoshenglong@huawei.com monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP command add_fd). Free it. Signed-off-by: Paolo Bonzini --- v1->v2: line length [Fam], pass &error_abort [Shannon] v2->v3: use "!!" instead of "? true : false" [Markus] --- vl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index eba5d4c..5985680 100644 --- a/vl.c +++ b/vl.c @@ -1011,6 +1011,7 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) int fd, dupfd, flags; int64_t fdset_id; const char *fd_opaque = NULL; + AddfdInfo *fdinfo; fd = qemu_opt_get_number(opts, "fd", -1); fdset_id = qemu_opt_get_number(opts, "set", -1); @@ -1060,8 +1061,9 @@ static int parse_add_fd(QemuOpts *opts, void *opaque) } /* add the duplicate fd, and optionally the opaque string, to the fd set */ - monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false, - fd_opaque, NULL); + fdinfo = monitor_fdset_add_fd(dupfd, true, fdset_id, !!fd_opaque, fd_opaque, + &error_abort); + g_free(fdinfo); return 0; } -- 2.3.0