hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

screencopy-v1: fix frame_shm_copy() error path 

Don't call wlr_renderer_end() if wlr_renderer_begin_with_buffer()
failed. This will result in an abort().
This commit is contained in:
Simon Ser 2022-10-03 11:35:59 +02:00 committed by Alexander Orzechowski
parent 0613fb0159
commit 0af4affd0b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/wlr_screencopy_v1.c
View File

@ -209,16 +209,18 @@ static bool frame_shm_copy(struct wlr_screencopy_frame_v1 *frame,
} }
uint32_t renderer_flags = 0; uint32_t renderer_flags = 0;
bool ok; bool ok = false;
ok = wlr_renderer_begin_with_buffer(renderer, src_buffer); if (!wlr_renderer_begin_with_buffer(renderer, src_buffer)) {
ok = ok && wlr_renderer_read_pixels(renderer, format, &renderer_flags, goto out;
}
ok = wlr_renderer_read_pixels(renderer, format, &renderer_flags,
stride, width, height, x, y, 0, 0, data); stride, width, height, x, y, 0, 0, data);
wlr_renderer_end(renderer); wlr_renderer_end(renderer);
*flags = renderer_flags & WLR_RENDERER_READ_PIXELS_Y_INVERT ? *flags = renderer_flags & WLR_RENDERER_READ_PIXELS_Y_INVERT ?
ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT : 0; ZWLR_SCREENCOPY_FRAME_V1_FLAGS_Y_INVERT : 0;
out:
wlr_buffer_end_data_ptr_access(frame->buffer); wlr_buffer_end_data_ptr_access(frame->buffer);
return ok; return ok;
} }