system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-23 03:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clients/window: destroy remaining globals

Browse source 
Destroy the remaining globals on exit. Fixes a bunch of leaks reported
by ASan.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-05-21 17:31:11 +03:00
parent 1e08a81c43
commit c8c53bafd3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/window.c
View file

@ -6083,8 +6083,6 @@ registry_handle_global_remove(void *data, struct wl_registry *registry,
if (strcmp(global->interface, "wl_output") == 0)
display_destroy_output(d, name);
/* XXX: Should destroy remaining bound globals */
global_destroy(d, global);
}
}
@ -6328,6 +6326,8 @@ display_destroy_inputs(struct display *display)
void
display_destroy(struct display *display)
{
struct global *global, *tmp;
if (!wl_list_empty(&display->window_list))
fprintf(stderr, "toytoolkit warning: %d windows exist.\n",
wl_list_length(&display->window_list));
@ -6343,6 +6343,9 @@ display_destroy(struct display *display)
display_destroy_outputs(display);
display_destroy_inputs(display);
wl_list_for_each_safe(global, tmp, &display->global_list, link)
global_destroy(display, global);
xkb_context_unref(display->xkb_context);
if (display->theme)
@ -6354,6 +6357,15 @@ display_destroy(struct display *display)
fini_egl(display);
#endif
if (display->relative_pointer_manager)
zwp_relative_pointer_manager_v1_destroy(display->relative_pointer_manager);
if (display->pointer_constraints)
zwp_pointer_constraints_v1_destroy(display->pointer_constraints);
if (display->viewporter)
wp_viewporter_destroy(display->viewporter);
if (display->subcompositor)
wl_subcompositor_destroy(display->subcompositor);