[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] vnc: remove memory leaks in zlib and tight en
From: |
Corentin Chary |
Subject: |
[Qemu-devel] [PATCH 08/10] vnc: remove memory leaks in zlib and tight encoding |
Date: |
Tue, 18 May 2010 09:31:19 +0200 |
Also introduce a new helper to free buffers: buffer_free()
Signed-off-by: Corentin Chary <address@hidden>
---
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; i<ARRAY_SIZE(vs->tight_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 */
--
1.7.0.2
- [Qemu-devel] (no subject), Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 07/10] vnc: don't clear zlib stream on set_encoding, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 10/10] vnc: update copyrights for vnc-encoding-tight.c, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 09/10] vnc: tight: add palette encoding, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 08/10] vnc: remove memory leaks in zlib and tight encoding,
Corentin Chary <=
- [Qemu-devel] [PATCH 05/10] vnc: add basic tight support, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 06/10] vnc: add support for tight fill encoding, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 03/10] vnc: only use a single zlib stream, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 04/10] vnc: adjust compression zstream level, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 02/10] vnc: really call zlib if we want zlib, Corentin Chary, 2010/05/18
- [Qemu-devel] [PATCH 01/10] vnc: refactor set_encodings, Corentin Chary, 2010/05/18
- [Qemu-devel] Re: [PATCH 01/10] vnc: refactor set_encodings, Alexander Graf, 2010/05/18