Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

Commit

Permalink
sceeencopy-v1: listen to output destroy in capture_output
Browse files Browse the repository at this point in the history
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: #3284
  • Loading branch information
emersion committed Oct 29, 2021
1 parent a80f2b2 commit 3b96aa0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions types/wlr_screencopy_v1.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,9 +438,6 @@ static void frame_handle_copy(struct wl_client *wl_client,
wl_signal_add(&output->events.destroy, &frame->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);
frame->buffer_destroy.notify = frame_handle_buffer_destroy;

Expand Down Expand Up @@ -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_enable.link);
wl_list_init(&frame->output_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) {
goto error;
}
Expand Down

0 comments on commit 3b96aa0

Please sign in to comment.