mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

util/global: fix memory leak on display destroy in wlr_global_destroy_safe

Browse source 
If the display is destroyed before wlr_global_destroy_safe's timer
fires, the struct destroy_global_data is leaked. This shouldn't cause
issues in practice because the timer will never fire, but makes it
harder to spot compositor memory leaks.
This commit is contained in:
Simon Ser 2022-06-07 18:18:11 +02:00
parent 09498499f6
commit b89ed9015c
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
util/global.c
View file

@ -4,16 +4,27 @@
struct destroy_global_data { struct destroy_global_data {
struct wl_global *global; struct wl_global *global;
struct wl_event_source *event_source; struct wl_event_source *event_source;
struct wl_listener display_destroy;
}; };
static int destroy_global(void *_data) { static void destroy_global(struct destroy_global_data *data) {
struct destroy_global_data *data = _data; wl_list_remove(&data->display_destroy.link);
wl_global_destroy(data->global); wl_global_destroy(data->global);
wl_event_source_remove(data->event_source); wl_event_source_remove(data->event_source);
free(data); free(data);
}
static int handle_timer_event(void *data) {
destroy_global(data);
return 0; return 0;
} }
static void handle_display_destroy(struct wl_listener *listener, void *_data) {
struct destroy_global_data *data =
wl_container_of(listener, data, display_destroy);
destroy_global(data);
}
void wlr_global_destroy_safe(struct wl_global *global) { void wlr_global_destroy_safe(struct wl_global *global) {
// Don't destroy the global immediately. If the global has been created // Don't destroy the global immediately. If the global has been created
// recently, clients might try to bind to it after we've destroyed it. // recently, clients might try to bind to it after we've destroyed it.
@ -33,11 +44,14 @@ void wlr_global_destroy_safe(struct wl_global *global) {
} }
data->global = global; data->global = global;
data->event_source = data->event_source =
wl_event_loop_add_timer(event_loop, destroy_global, data); wl_event_loop_add_timer(event_loop, handle_timer_event, data);
if (data->event_source == NULL) { if (data->event_source == NULL) {
free(data); free(data);
wl_global_destroy(global); wl_global_destroy(global);
return; return;
} }
wl_event_source_timer_update(data->event_source, 5000); wl_event_source_timer_update(data->event_source, 5000);
data->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &data->display_destroy);
} }