enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e comp - shape rects - handle logic hol where num > 0 but rects is null 

don't fall in this hole and crash...
This commit is contained in:
Carsten Haitzler 2020-05-01 15:12:16 +01:00
parent 81d8a1351d
commit 48bcb8d0b3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_comp_object.c
View File

@ -3850,7 +3850,7 @@ e_comp_object_shape_apply(Evas_Object *obj)
_e_comp_object_alpha_set(cw);
return;
}
if (cw->ec->shaped)
if ((cw->ec->shaped) && (cw->ec->shape_rects))
{
unsigned char *spix, *sp;

3
src/bin/e_comp_x.c
View File

@ -3309,7 +3309,7 @@ _e_comp_x_client_shape_rects_check(E_Client *ec, Ecore_X_Rectangle *rects, int n
}
}
}
if (changed)
if ((changed) && (rects))
{
E_FREE(ec->shape_rects);
ec->shape_rects = (Eina_Rectangle*)rects;
@ -4323,6 +4323,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
{
ec->shaped = 1;
E_FREE(ec->shape_rects);
ec->shape_rects_num = 0;
E_FREE(ec->shape_input_rects);
ec->shape_input_rects_num = 0;
e_comp_object_frame_theme_set(ec->frame, E_COMP_OBJECT_FRAME_RESHADOW);