blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sceeencopy-v1: listen to output destroy in capture_output 

If the output is destroyed after capture_output but before
frame_handle_copy, it'll have a dangling output pointer. Add the
output destroy listener in capture_output.

Closes: https://github.com/swaywm/wlroots/issues/3284
This commit is contained in:
Simon Ser 2021-10-26 11:20:25 +02:00
parent a80f2b2816
commit 3b96aa04db
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/wlr_screencopy_v1.c
View File

@ -438,9 +438,6 @@ static void frame_handle_copy(struct wl_client *wl_client,
wl_signal_add(&output->events.destroy, &frame->output_enable); wl_signal_add(&output->events.destroy, &frame->output_enable);
frame->output_enable.notify = frame_handle_output_enable; frame->output_enable.notify = frame_handle_output_enable;
wl_signal_add(&output->events.destroy, &frame->output_destroy);
frame->output_destroy.notify = frame_handle_output_destroy;
wl_resource_add_destroy_listener(buffer_resource, &frame->buffer_destroy); wl_resource_add_destroy_listener(buffer_resource, &frame->buffer_destroy);
frame->buffer_destroy.notify = frame_handle_buffer_destroy; frame->buffer_destroy.notify = frame_handle_buffer_destroy;
@ -538,9 +535,11 @@ static void capture_output(struct wl_client *wl_client,
wl_list_init(&frame->output_commit.link); wl_list_init(&frame->output_commit.link);
wl_list_init(&frame->output_enable.link); wl_list_init(&frame->output_enable.link);
wl_list_init(&frame->output_destroy.link);
wl_list_init(&frame->buffer_destroy.link); wl_list_init(&frame->buffer_destroy.link);
wl_signal_add(&output->events.destroy, &frame->output_destroy);
frame->output_destroy.notify = frame_handle_output_destroy;
if (output == NULL || !output->enabled) { if (output == NULL || !output->enabled) {
goto error; goto error;
} }