From f13227945515f3d2f654573bda861505e86e6ffa Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 19 Oct 2017 10:26:27 +0300 Subject: [PATCH] compositor-wayland: actually free parent_output I could not find anywhere where struct parent_output was freed, so apparently we were leaking it. Check against wayland_backend_register_output() and add the missing clean-up: removal from the parent output list, and free(). registry_handle_global_remove() also needs fixing to use a safer loop, because now we are actually removing the list item. Signed-off-by: Pekka Paalanen Reviewed-by: Quentin Glidic Acked-by: Daniel Stone --- libweston/compositor-wayland.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index c0f67e9a..9486deae 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -2333,6 +2333,9 @@ wayland_parent_output_destroy(struct wayland_parent_output *output) wl_list_remove(&mode->link); free(mode); } + + wl_list_remove(&output->link); + free(output); } static void @@ -2385,9 +2388,9 @@ registry_handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) { struct wayland_backend *b = data; - struct wayland_parent_output *output; + struct wayland_parent_output *output, *next; - wl_list_for_each(output, &b->parent.output_list, link) + wl_list_for_each_safe(output, next, &b->parent.output_list, link) if (output->id == name) wayland_parent_output_destroy(output); }