mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-02-07 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop/output: Clear repaint timer earlier in destroy

Browse source 
The teardown of a sway_output is split in two: begin_destroy and
output_destroy. The former clears some state such as NULL'ing the
reference to wlr_output, while the latter frees the struct and its
remaining resources.

If an output is destroyed while a repaint timer is pending, future frame
callbacks will no longer occur as the listener is torn down in
begin_destroy, but the repaint timer is not torn down and may still
fire until output_destroy is hit. As begin_destroy cleared the reference
to wlr_output, this leads to a NULL-pointer dereference.

Tear down the repaint timer in begin_destroy as there is no need for it.

Fixes: fdc4318ac6 ("desktop/output: Clear frame_pending even output is disabled")
(cherry picked from commit 5312376077)
This commit is contained in:
Kenny Levinsen 2024-11-17 21:43:31 +01:00 committed by Simon Ser
parent b072958b49
commit 78750f58a3
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/output.c
View file

@ -459,6 +459,9 @@ static void begin_destroy(struct sway_output *output) {
output->wlr_output->data = NULL;
output->wlr_output = NULL;
wl_event_source_remove(output->repaint_timer);
output->repaint_timer = NULL;
request_modeset();
}

1
sway/tree/output.c
View file

@ -273,7 +273,6 @@ void output_destroy(struct sway_output *output) {
destroy_scene_layers(output);
list_free(output->workspaces);
list_free(output->current.workspaces);
wl_event_source_remove(output->repaint_timer);
wlr_color_transform_unref(output->color_transform);
free(output);
}