diff options
| author | emersion <contact@emersion.fr> | 2018-01-30 19:45:57 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-01-30 19:45:57 +0100 |
| commit | babdd6ccf757f18ef15b50d9f16c55031a7c1944 (patch) | |
| tree | 4e1d065ea0b710c44d362b07cc941cd290d5ac46 /backend/x11 | |
| parent | 704130cc1164604c5b805adf186999269e14c5a5 (diff) | |
backend: fix use-after-free when destroying backends
The backend destroy signal is emitted before the output_remove
signal is. When the destroy signal is emitted listeners remove
their output_remove listener, so the output_remove signal is never
received and listeners have an invalid output pointer.
The correct way to solve this would be to remove the output_remove
signal completely and use the wlr_output.events.destroy signal
instead. This isn't yet possible because wl_signal_emit is unsafe
and listeners cannot be removed in listeners.
Diffstat (limited to 'backend/x11')
| -rw-r--r-- | backend/x11/backend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 3bad8d61..44e29be1 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -259,6 +259,8 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { xkb_state_unref(x11->keyboard_dev.keyboard->xkb_state); } + wl_signal_emit(&backend->events.destroy, backend); + wl_list_remove(&x11->display_destroy.link); wl_event_source_remove(x11->frame_timer); |