From 36d5d4b40f5caf0b7bcccbcc3bfeec3afb23946b Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 25 May 2018 19:42:23 +0100 Subject: [PATCH] client/pool-buffer: munmap in destroy_buffer --- client/pool-buffer.c | 7 ++++++- include/pool-buffer.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/pool-buffer.c b/client/pool-buffer.c index 7610d223..52438303 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c @@ -72,7 +72,7 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm, struct pool_buffer *buf, int32_t width, int32_t height, uint32_t format) { uint32_t stride = width * 4; - uint32_t size = stride * height; + size_t size = stride * height; char *name; int fd = create_pool_file(size, &name); @@ -87,8 +87,10 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm, free(name); fd = -1; + buf->size = size; buf->width = width; buf->height = height; + buf->data = data; buf->surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride); buf->cairo = cairo_create(buf->surface); @@ -111,6 +113,9 @@ void destroy_buffer(struct pool_buffer *buffer) { if (buffer->pango) { g_object_unref(buffer->pango); } + if (buffer->data) { + munmap(buffer->data, buffer->size); + } memset(buffer, 0, sizeof(struct pool_buffer)); } diff --git a/include/pool-buffer.h b/include/pool-buffer.h index 856f7c8c..54f5be06 100644 --- a/include/pool-buffer.h +++ b/include/pool-buffer.h @@ -12,6 +12,8 @@ struct pool_buffer { cairo_t *cairo; PangoContext *pango; uint32_t width, height; + void *data; + size_t size; bool busy; };