mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: actually free parent_output

Browse Source 
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 <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2017-10-19 10:26:27 +03:00
parent 4dab58343b
commit f132279455
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-wayland.c
+5 -2
View File
@@ -2333,6 +2333,9 @@ wayland_parent_output_destroy(struct wayland_parent_output *output)
wl_list_remove(&mode->link); wl_list_remove(&mode->link);
free(mode); free(mode);
} }
wl_list_remove(&output->link);
free(output);
} }
static void static void
@@ -2385,9 +2388,9 @@ registry_handle_global_remove(void *data, struct wl_registry *registry,
uint32_t name) uint32_t name)
{ {
struct wayland_backend *b = data; 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) if (output->id == name)
wayland_parent_output_destroy(output); wayland_parent_output_destroy(output);
} }