PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2025-04-07 17:44:04 -04:00
Code Releases Activity

backend/xrender: fix NULL dereference

Browse source 
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2024-05-20 06:33:10 +01:00
parent 8e0cf0241b
commit 0571bc82bf
No known key found for this signature in database
GPG key ID: D3A4405BE6CC17F4
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/backend/xrender/xrender.c
View file

@ -494,9 +494,6 @@ xrender_copy_area(struct backend_base *base, ivec2 origin, image_handle target_h
static bool xrender_blur(struct backend_base *base, ivec2 origin,
image_handle target_handle, const struct backend_blur_args *args) {
auto bctx = (struct xrender_blur_context *)args->blur_context;
auto source_mask = args->source_image
? (struct xrender_image_data_inner *)args->source_mask->image
: NULL;
auto source = (struct xrender_image_data_inner *)args->source_image;
auto target = (struct xrender_image_data_inner *)target_handle;
if (bctx->method == BLUR_METHOD_NONE) {
@ -547,22 +544,18 @@ static bool xrender_blur(struct backend_base *base, ivec2 origin,
xcb_render_picture_t src_pict = source->pict;
auto mask_pict = xd->alpha_pict[(int)(args->opacity * MAX_ALPHA)];
bool mask_allocated = false;
auto mask_pict_origin = args->source_mask->origin;
if (source_mask != NULL) {
ivec2 mask_pict_origin = {};
if (args->source_mask != NULL) {
// Translate the target mask region to the mask's coordinate
auto mask_extent = *pixman_region32_extents(args->target_mask);
region_translate_rect(
mask_extent, ivec2_neg(ivec2_add(origin, args->source_mask->origin)));
mask_pict_origin = args->source_mask->origin;
mask_pict = xrender_process_mask(xd, args->source_mask, mask_extent,
args->opacity != 1.0 ? mask_pict : XCB_NONE,
&mask_pict_origin, &mask_allocated);
mask_pict_origin.x -= extent_resized->x1;
mask_pict_origin.y -= extent_resized->y1;
} else {
// Sampling the 1x1 alpha pict out-of-bound while the X server is under
// heavy load, which it will be if blur is enabled, produces unpredictable
// results... This is a workaround for that.
mask_pict_origin = (ivec2){0, 0};
}
x_set_picture_clip_region(c, src_pict, 0, 0, &reg_op_resized);
x_set_picture_clip_region(c, target->pict, 0, 0, args->target_mask);