Patchwork vnc: fix a memory leak in threaded vnc server

login
register
mail settings
Submitter Corentin Chary
Date Feb. 25, 2011, 9:54 p.m.
Message ID <1298670893-15157-1-git-send-email-corentincj@iksaif.net>
Download mbox | patch
Permalink /patch/84575/
State New
Headers show

Comments

Corentin Chary - Feb. 25, 2011, 9:54 p.m.
VncJobQueue's buffer is intended to be used for
as the output buffer for all operations in this queue,
but unfortunatly.

vnc_async_encoding_start() is in charge of setting this
buffer as the current output buffer, but
vnc_async_encoding_end() was not writting the changes back
to VncJobQueue, resulting in a big and ugly memleak.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
I believe this is a (slightly) better patch than Bruce's one, because
it reduce memory allocations by using always the same buffer.

 ui/vnc-jobs-async.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Anthony Liguori - Feb. 25, 2011, 10:50 p.m.
On 02/25/2011 03:54 PM, Corentin Chary wrote:
> VncJobQueue's buffer is intended to be used for
> as the output buffer for all operations in this queue,
> but unfortunatly.
>
> vnc_async_encoding_start() is in charge of setting this
> buffer as the current output buffer, but
> vnc_async_encoding_end() was not writting the changes back
> to VncJobQueue, resulting in a big and ugly memleak.
>
> Signed-off-by: Corentin Chary<corentincj@iksaif.net>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
> I believe this is a (slightly) better patch than Bruce's one, because
> it reduce memory allocations by using always the same buffer.
>
>   ui/vnc-jobs-async.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c
> index 1d4c5e7..f596247 100644
> --- a/ui/vnc-jobs-async.c
> +++ b/ui/vnc-jobs-async.c
> @@ -186,6 +186,8 @@ static void vnc_async_encoding_end(VncState *orig, VncState *local)
>       orig->hextile = local->hextile;
>       orig->zrle = local->zrle;
>       orig->lossy_rect = local->lossy_rect;
> +
> +    queue->buffer = local->output;
>   }
>
>   static int vnc_worker_thread_loop(VncJobQueue *queue)
>

Patch

diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c
index 1d4c5e7..f596247 100644
--- a/ui/vnc-jobs-async.c
+++ b/ui/vnc-jobs-async.c
@@ -186,6 +186,8 @@  static void vnc_async_encoding_end(VncState *orig, VncState *local)
     orig->hextile = local->hextile;
     orig->zrle = local->zrle;
     orig->lossy_rect = local->lossy_rect;
+
+    queue->buffer = local->output;
 }
 
 static int vnc_worker_thread_loop(VncJobQueue *queue)