cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e1bd14f9331b8622b89c3e7992e2ea6d3678ea43
commit e1bd14f9331b8622b89c3e7992e2ea6d3678ea43
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Mon Feb 6 10:45:12 2017 -0800
evas: harden check on map presence.
---
src/lib/evas/canvas/evas_object_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index f83f1c1..b245454 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -276,7 +276,9 @@ evas_object_clip_recalc(Evas_Object_Protected_Data *obj)
// I don't know why this test was here in the first place. As I have
// no issue showing up due to this, I keep it and move color out of it.
// breaks cliping of mapped images!!!
- if (clipper->map->cur.map_parent == obj->map->cur.map_parent)
+ if (EINA_LIKELY(!!clipper->map) &&
+ EINA_LIKELY(!!obj->map) &&
+ clipper->map->cur.map_parent == obj->map->cur.map_parent)
{
nx = clipper->cur->cache.clip.x;
ny = clipper->cur->cache.clip.y;
--
