From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 01/18] ui/vdagent: fix leak on error path
Date: Tue, 31 Aug 2021 17:31:15 +0400 [thread overview]
Message-ID: <20210831133132.1697228-2-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20210831133132.1697228-1-marcandre.lureau@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
"info" was leaked when more than 10 entries.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210805135715.857938-2-marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/clipboard.h | 2 ++
ui/vdagent.c | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h
index b45b984c9f..eb789a285a 100644
--- a/include/ui/clipboard.h
+++ b/include/ui/clipboard.h
@@ -190,4 +190,6 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer,
const void *data,
bool update);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref)
+
#endif /* QEMU_CLIPBOARD_H */
diff --git a/ui/vdagent.c b/ui/vdagent.c
index a253a8fe63..f6ef8d1993 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -438,7 +438,7 @@ static void vdagent_chr_recv_clipboard(VDAgentChardev *vd, VDAgentMessage *msg)
uint8_t s = VD_AGENT_CLIPBOARD_SELECTION_CLIPBOARD;
uint32_t size = msg->size;
void *data = msg->data;
- QemuClipboardInfo *info;
+ g_autoptr(QemuClipboardInfo) info = NULL;
QemuClipboardType type;
if (have_selection(vd)) {
@@ -477,7 +477,6 @@ static void vdagent_chr_recv_clipboard(VDAgentChardev *vd, VDAgentMessage *msg)
size -= sizeof(uint32_t);
}
qemu_clipboard_update(info);
- qemu_clipboard_info_unref(info);
break;
case VD_AGENT_CLIPBOARD_REQUEST:
if (size < sizeof(uint32_t)) {
@@ -523,7 +522,6 @@ static void vdagent_chr_recv_clipboard(VDAgentChardev *vd, VDAgentMessage *msg)
/* set empty clipboard info */
info = qemu_clipboard_info_new(NULL, s);
qemu_clipboard_update(info);
- qemu_clipboard_info_unref(info);
}
break;
}
--
2.33.0.rc2
next prev parent reply other threads:[~2021-08-31 13:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 13:31 [PULL 00/18] UI/clipboard fixes marcandre.lureau
2021-08-31 13:31 ` marcandre.lureau [this message]
2021-08-31 13:31 ` [PULL 02/18] ui/vdagent: remove copy-pasta comment marcandre.lureau
2021-08-31 13:31 ` [PULL 03/18] ui/gtk-clipboard: use existing macros marcandre.lureau
2021-08-31 13:31 ` [PULL 04/18] ui/gtk-clipboard: fix clipboard enum typo marcandre.lureau
2021-08-31 13:31 ` [PULL 05/18] ui/clipboard: add helper to retrieve current clipboard marcandre.lureau
2021-08-31 13:31 ` [PULL 06/18] ui/clipboard: add qemu_clipboard_peer_owns() helper marcandre.lureau
2021-08-31 13:31 ` [PULL 07/18] ui/clipboard: add qemu_clipboard_peer_release() helper marcandre.lureau
2021-08-31 13:31 ` [PULL 08/18] ui/clipboard: release owned grabs on unregister marcandre.lureau
2021-08-31 13:31 ` [PULL 09/18] ui/vdagent: disconnect handlers and reset state on finalize marcandre.lureau
2021-08-31 13:31 ` [PULL 10/18] ui/vdagent: reset outbuf on disconnect marcandre.lureau
2021-08-31 13:31 ` [PULL 11/18] ui/vdagent: split clipboard recv message handling marcandre.lureau
2021-08-31 13:31 ` [PULL 12/18] ui/vdagent: use qemu_clipboard_peer_release helper marcandre.lureau
2021-08-31 13:31 ` [PULL 13/18] ui/vdagent: use qemu_clipboard_info helper marcandre.lureau
2021-08-31 13:31 ` [PULL 14/18] ui/vdagent: send empty clipboard when unhandled marcandre.lureau
2021-08-31 13:31 ` [PULL 15/18] ui/gtk-clipboard: use qemu_clipboard_info helper marcandre.lureau
2021-08-31 13:31 ` [PULL 16/18] ui/vdagent: send release when no clipboard owner marcandre.lureau
2021-08-31 13:31 ` [PULL 17/18] ui/gtk-clipboard: emit release clipboard events marcandre.lureau
2021-08-31 13:31 ` [PULL 18/18] ui/vdagent: add a migration blocker marcandre.lureau
2021-08-31 19:49 ` [PULL 00/18] UI/clipboard fixes Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210831133132.1697228-2-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).