qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: libvir-list@redhat.com, Gerd Hoffmann <kraxel@redhat.com>,
	Peter Wu <peter@lekensteyn.nl>,
	qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 02/12] vnc: fix memleak of the "vnc-worker-output" name
Date: Mon, 27 Aug 2018 10:53:10 +0200	[thread overview]
Message-ID: <20180827085320.9732-3-kraxel@redhat.com> (raw)
In-Reply-To: <20180827085320.9732-1-kraxel@redhat.com>

From: Peter Wu <peter@lekensteyn.nl>

Fixes repeated memory leaks of 18 bytes when using VNC:

    Direct leak of 831024 byte(s) in 46168 object(s) allocated from:
        ...
        #4 0x7f6d2f919bdd in g_strdup_vprintf glib/gstrfuncs.c:514
        #5 0x56085cdcf660 in buffer_init util/buffer.c:59
        #6 0x56085ca6a7ec in vnc_async_encoding_start ui/vnc-jobs.c:177
        #7 0x56085ca6b815 in vnc_worker_thread_loop ui/vnc-jobs.c:240

Fixes: 543b95801f98 ("vnc: attach names to buffers")
Cc: Gerd Hoffmann <kraxel@redhat.com>
CC: qemu-stable@nongnu.org
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180807221830.3844-1-peter@lekensteyn.nl
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/vnc-jobs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index b0b15d42a8..929391f85d 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -193,6 +193,7 @@ static void vnc_async_encoding_start(VncState *orig, VncState *local)
 
 static void vnc_async_encoding_end(VncState *orig, VncState *local)
 {
+    buffer_free(&local->output);
     orig->tight = local->tight;
     orig->zlib = local->zlib;
     orig->hextile = local->hextile;
@@ -278,7 +279,7 @@ static int vnc_worker_thread_loop(VncJobQueue *queue)
         /* Copy persistent encoding data */
         vnc_async_encoding_end(job->vs, &vs);
 
-	qemu_bh_schedule(job->vs->bh);
+        qemu_bh_schedule(job->vs->bh);
     }  else {
         buffer_reset(&vs.output);
         /* Copy persistent encoding data */
-- 
2.9.3

  parent reply	other threads:[~2018-08-27  8:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-27  8:53 [Qemu-devel] [PULL 00/12] Ui 20180827 v4 patches Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 01/12] ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag Gerd Hoffmann
2018-08-27  8:53 ` Gerd Hoffmann [this message]
2018-08-27  8:53 ` [Qemu-devel] [PULL 03/12] ui: use enum to string helpers Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 04/12] sdl2: redraw correctly when scanout_mode enabled Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 05/12] doc: switch to modern syntax for VNC TLS setup Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 06/12] vnc: remove support for deprecated tls, x509, x509verify options Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 07/12] spice-display: access ptr_x/ptr_y under Mutex Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 08/12] spice-display: fix qemu_spice_cursor_refresh_bh locking Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 09/12] ui/sdl2: Fix broken -full-screen CLI option Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 10/12] ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 11/12] dmabuf: add y0_top, pass it to spice Gerd Hoffmann
2018-08-27  8:53 ` [Qemu-devel] [PULL 12/12] util: promote qemu_egl_rendernode_open() to libqemuutil Gerd Hoffmann
2018-08-27 13:55 ` [Qemu-devel] [PULL 00/12] Ui 20180827 v4 patches Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2018-08-23  9:56 [Qemu-devel] [PULL 00/12] Ui 20180823 v3 patches Gerd Hoffmann
2018-08-23  9:56 ` [Qemu-devel] [PULL 02/12] vnc: fix memleak of the "vnc-worker-output" name Gerd Hoffmann
2018-08-21 12:05 [Qemu-devel] [PULL 00/12] Ui 20180821 v2 patches Gerd Hoffmann
2018-08-21 12:05 ` [Qemu-devel] [PULL 02/12] vnc: fix memleak of the "vnc-worker-output" name Gerd Hoffmann
2018-08-21  7:44 [Qemu-devel] [PULL 00/12] Ui 20180821 patches Gerd Hoffmann
2018-08-21  7:44 ` [Qemu-devel] [PULL 02/12] vnc: fix memleak of the "vnc-worker-output" name Gerd Hoffmann

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=20180827085320.9732-3-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=libvir-list@redhat.com \
    --cc=peter@lekensteyn.nl \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@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).