mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-14 06:59:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

img: remove "theme" member from lab_img

Browse source 
lab_img.theme member was referenced by "modifier" functions when drawing a
hover effect on button buffers or rounding the button buffer for corner
buttons, but this can be prone to use-after-free and was not very clean
because theme and lab_img were referencing each other.

Instead, let's just reference rc.theme in the modifier functions and
remove theme from lab_img.
This commit is contained in:
tokyo4j 2025-01-03 23:57:40 +09:00 • committed by Consolatis
parent 956b271f9b
commit 90a8c3e793
3 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/img/img.c
View file

@ -106,10 +106,8 @@ lab_img_copy(struct lab_img *img)
}
void
lab_img_add_modifier(struct lab_img *img, lab_img_modifier_func_t modifier,
struct theme *theme)
lab_img_add_modifier(struct lab_img *img, lab_img_modifier_func_t modifier)
{
img->theme = theme;
lab_img_modifier_func_t *mod = wl_array_add(&img->modifiers, sizeof(*mod));
*mod = modifier;
}
@ -185,7 +183,7 @@ lab_img_render(struct lab_img *img, int width, int height, int padding,
lab_img_modifier_func_t *modifier;
wl_array_for_each(modifier, &img->modifiers) {
cairo_save(cairo);
(*modifier)(img->theme, cairo, width, height);
(*modifier)(cairo, width, height);
cairo_restore(cairo);
}