From patchwork Tue May 18 07:31:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 52848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4108EB7D8E for ; Tue, 18 May 2010 18:23:47 +1000 (EST) Received: from localhost ([127.0.0.1]:47767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEI5W-0003Tf-RO for incoming@patchwork.ozlabs.org; Tue, 18 May 2010 04:23:43 -0400 Received: from [140.186.70.92] (port=52546 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OEHM5-00037x-1h for qemu-devel@nongnu.org; Tue, 18 May 2010 03:39:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OEHDT-0007yU-1t for qemu-devel@nongnu.org; Tue, 18 May 2010 03:31:05 -0400 Received: from iksaif.net ([88.191.73.63]:38615) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OEHDS-0007x7-Aa for qemu-devel@nongnu.org; Tue, 18 May 2010 03:27:50 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 040ADC90038; Tue, 18 May 2010 09:31:23 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Tue, 18 May 2010 09:31:19 +0200 Message-Id: <1274167881-6966-9-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> References: <1274167881-6966-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Adam Litke Subject: [Qemu-devel] [PATCH 08/10] vnc: remove memory leaks in zlib and tight encoding X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also introduce a new helper to free buffers: buffer_free() Signed-off-by: Corentin Chary --- vnc-encoding-tight.c | 11 +++++++++++ vnc-encoding-zlib.c | 8 ++++++++ vnc.c | 23 ++++++++++++++--------- vnc.h | 4 +++- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/vnc-encoding-tight.c b/vnc-encoding-tight.c index 229927e..44984f9 100644 --- a/vnc-encoding-tight.c +++ b/vnc-encoding-tight.c @@ -499,6 +499,17 @@ static int find_large_solid_color_rect(VncState *vs, int x, int y, return n + send_rect_simple(vs, x, y, w, h); } +void vnc_tight_clear(VncState *vs) +{ + int i; + for (i=0; itight_stream); i++) + if (vs->tight_stream[i].opaque) + deflateEnd(&vs->tight_stream[i]); + + buffer_free(&vs->tight); + buffer_free(&vs->tight_zlib); +} + int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) { diff --git a/vnc-encoding-zlib.c b/vnc-encoding-zlib.c index 6b68540..e5a431e 100644 --- a/vnc-encoding-zlib.c +++ b/vnc-encoding-zlib.c @@ -143,3 +143,11 @@ int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) return 1; } + +void vnc_zlib_clear(VncState *vs) +{ + if (vs->zlib_stream.opaque) + deflateEnd(&vs->zlib_stream); + + buffer_free(&vs->zlib); +} diff --git a/vnc.c b/vnc.c index f660c10..0dac736 100644 --- a/vnc.c +++ b/vnc.c @@ -503,7 +503,15 @@ uint8_t *buffer_end(Buffer *buffer) void buffer_reset(Buffer *buffer) { - buffer->offset = 0; + buffer->offset = 0; +} + +void buffer_free(Buffer *buffer) +{ + qemu_free(buffer->buffer); + buffer->offset = 0; + buffer->capacity = 0; + buffer->buffer = NULL; } void buffer_append(Buffer *buffer, const void *data, size_t len) @@ -922,17 +930,14 @@ static void vnc_disconnect_finish(VncState *vs) { vnc_qmp_event(vs, QEVENT_VNC_DISCONNECTED); - if (vs->input.buffer) { - qemu_free(vs->input.buffer); - vs->input.buffer = NULL; - } - if (vs->output.buffer) { - qemu_free(vs->output.buffer); - vs->output.buffer = NULL; - } + buffer_free(&vs->input); + buffer_free(&vs->output); qobject_decref(vs->info); + vnc_tight_clear(vs); + vnc_zlib_clear(vs); + #ifdef CONFIG_VNC_TLS vnc_tls_client_cleanup(vs); #endif /* CONFIG_VNC_TLS */ diff --git a/vnc.h b/vnc.h index ea6e70b..18a4e8b 100644 --- a/vnc.h +++ b/vnc.h @@ -383,7 +383,7 @@ int buffer_empty(Buffer *buffer); uint8_t *buffer_end(Buffer *buffer); void buffer_reset(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len); - +void buffer_free(Buffer *buffer); /* Misc helpers */ @@ -403,10 +403,12 @@ int vnc_hextile_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); void vnc_hextile_set_pixel_conversion(VncState *vs, int generic); +void vnc_zlib_clear(VncState *vs); void *vnc_zlib_zalloc(void *x, unsigned items, unsigned size); void vnc_zlib_zfree(void *x, void *addr); int vnc_zlib_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); +void vnc_tight_clear(VncState *vs); int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); #endif /* __QEMU_VNC_H */