hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

screencopy: fix segfault on disabled output

Browse source 
Disconnecting or disabling an output between capture_output() and
ready() could cause either a NULL dereference or an incorrect
attach_render_locks count.
This commit is contained in:
Jason Francis 2019-07-27 19:20:49 -04:00 committed by Simon Ser
parent ca45f4490c
commit ce3e413e83
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
types/wlr_screencopy_v1.c
View file

@ -23,10 +23,12 @@ static void frame_destroy(struct wlr_screencopy_frame_v1 *frame) {
if (frame == NULL) { if (frame == NULL) {
return; return;
} }
if (frame->output != NULL && frame->buffer != NULL) {
wlr_output_lock_attach_render(frame->output, false); wlr_output_lock_attach_render(frame->output, false);
if (frame->cursor_locked) { if (frame->cursor_locked) {
wlr_output_lock_software_cursors(frame->output, false); wlr_output_lock_software_cursors(frame->output, false);
} }
}
wl_list_remove(&frame->link); wl_list_remove(&frame->link);
wl_list_remove(&frame->output_precommit.link); wl_list_remove(&frame->output_precommit.link);
wl_list_remove(&frame->buffer_destroy.link); wl_list_remove(&frame->buffer_destroy.link);
@ -104,6 +106,12 @@ static void frame_handle_copy(struct wl_client *client,
struct wlr_output *output = frame->output; struct wlr_output *output = frame->output;
if (!output->enabled) {
zwlr_screencopy_frame_v1_send_failed(frame->resource);
frame_destroy(frame);
return;
}
struct wl_shm_buffer *buffer = wl_shm_buffer_get(buffer_resource); struct wl_shm_buffer *buffer = wl_shm_buffer_get(buffer_resource);
if (buffer == NULL) { if (buffer == NULL) {
wl_resource_post_error(frame->resource, wl_resource_post_error(frame->resource,
@ -180,23 +188,6 @@ static void capture_output(struct wl_client *client,
struct wlr_screencopy_manager_v1 *manager, uint32_t version, uint32_t id, struct wlr_screencopy_manager_v1 *manager, uint32_t version, uint32_t id,
int32_t overlay_cursor, struct wlr_output *output, int32_t overlay_cursor, struct wlr_output *output,
const struct wlr_box *box) { const struct wlr_box *box) {
struct wlr_box buffer_box = {0};
if (box == NULL) {
buffer_box.width = output->width;
buffer_box.height = output->height;
} else {
int ow, oh;
wlr_output_effective_resolution(output, &ow, &oh);
buffer_box = *box;
wlr_box_transform(&buffer_box, &buffer_box, output->transform, ow, oh);
buffer_box.x *= output->scale;
buffer_box.y *= output->scale;
buffer_box.width *= output->scale;
buffer_box.height *= output->scale;
}
struct wlr_screencopy_frame_v1 *frame = struct wlr_screencopy_frame_v1 *frame =
calloc(1, sizeof(struct wlr_screencopy_frame_v1)); calloc(1, sizeof(struct wlr_screencopy_frame_v1));
if (frame == NULL) { if (frame == NULL) {
@ -222,6 +213,10 @@ static void capture_output(struct wl_client *client,
wl_list_init(&frame->output_precommit.link); wl_list_init(&frame->output_precommit.link);
wl_list_init(&frame->buffer_destroy.link); wl_list_init(&frame->buffer_destroy.link);
if (output == NULL || !output->enabled) {
goto error;
}
struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend); struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
assert(renderer); assert(renderer);
@ -231,6 +226,23 @@ static void capture_output(struct wl_client *client,
goto error; goto error;
} }
struct wlr_box buffer_box = {0};
if (box == NULL) {
buffer_box.width = output->width;
buffer_box.height = output->height;
} else {
int ow, oh;
wlr_output_effective_resolution(output, &ow, &oh);
buffer_box = *box;
wlr_box_transform(&buffer_box, &buffer_box, output->transform, ow, oh);
buffer_box.x *= output->scale;
buffer_box.y *= output->scale;
buffer_box.width *= output->scale;
buffer_box.height *= output->scale;
}
frame->box = buffer_box; frame->box = buffer_box;
frame->stride = 4 * buffer_box.width; // TODO: depends on read format frame->stride = 4 * buffer_box.width; // TODO: depends on read format