mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/output.c: ensure we don't carry around a stale output pointer

Browse source 
Prevent carrying around the wlr_output->data pointer when
destroying an output. The set_gamma handler may be called
during the destruction of a wlr_output after our own
destroy handler has already been called. This patch resets
the wlr_output->data pointer in our destroy handler and
adds a check in the set_gamma handler to verify the output
is actually valid.

Fixes #1270

Reported-by: @Flrian
This commit is contained in:
Consolatis 2023-12-02 15:05:26 +01:00
parent fcf21e1464
commit e841d44b6f
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/output.c
View file

@ -99,6 +99,14 @@ output_destroy_notify(struct wl_listener *listener, void *data)
view_on_output_destroy(view); view_on_output_destroy(view);
} }
} }
/*
* Ensure that we don't accidentally try to dereference
* the output pointer in some output event handler like
* set_gamma.
*/
output->wlr_output->data = NULL;
/* /*
* output->scene_output (if still around at this point) is * output->scene_output (if still around at this point) is
* destroyed automatically when the wlr_output is destroyed * destroyed automatically when the wlr_output is destroyed
@ -569,6 +577,9 @@ handle_gamma_control_set_gamma(struct wl_listener *listener, void *data)
const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data; const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
struct output *output = event->output->data; struct output *output = event->output->data;
if (!output_is_usable(output)) {
return;
}
output->gamma_lut_changed = true; output->gamma_lut_changed = true;
wlr_output_schedule_frame(output->wlr_output); wlr_output_schedule_frame(output->wlr_output);
} }