From 3b96aa04db0fee7231fba4fdeaed575478d88fcd Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 26 Oct 2021 11:20:25 +0200 Subject: [PATCH] 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 --- types/wlr_screencopy_v1.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c index 5ef9d2694..04dd9e3d2 100644 --- a/types/wlr_screencopy_v1.c +++ b/types/wlr_screencopy_v1.c @@ -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; @@ -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; }