dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: add NULL check to avoid crash when clipper dosen't have a layer. 

Summary:
There is a crash in naviframe demo and the stack points to the clip set function where it tries to acess evas object
from a NULL layer , by going through the log found out raster has already added the NULL check in clip_unset function
so just added the check in clip_set.

Reviewers: seoz, raster

CC: cedric

Differential Revision: https://phab.enlightenment.org/D625
This commit is contained in:
Subhransu Sekhar Mohanty 2014-03-15 19:55:38 +09:00 committed by Cedric BAIL
parent 2eaf9049b9
commit 4d8fbd623c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/evas/canvas/evas_clip.c
View File

@ -264,14 +264,19 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
state_write->have_clipees = 0;
}
EINA_COW_STATE_WRITE_END(obj->cur->clipper, state_write, cur);
e = obj->cur->clipper->layer->evas;
if (obj->cur->clipper->cur->visible)
evas_damage_rectangle_add(e->evas,
obj->cur->clipper->cur->geometry.x + e->framespace.x,
obj->cur->clipper->cur->geometry.y + e->framespace.y,
obj->cur->clipper->cur->geometry.w,
obj->cur->clipper->cur->geometry.h);
if ((obj->cur->clipper->cur) && (obj->cur->clipper->cur->visible))
{
if (obj->cur->clipper->layer)
{
e = obj->cur->clipper->layer->evas;
evas_damage_rectangle_add(e->evas,
obj->cur->clipper->cur->geometry.x + e->framespace.x,
obj->cur->clipper->cur->geometry.y + e->framespace.y,
obj->cur->clipper->cur->geometry.w,
obj->cur->clipper->cur->geometry.h);
}
}
}
evas_object_change(obj->cur->clipper->object, obj->cur->clipper);
evas_object_change(eo_obj, obj);