aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-02-06 10:45:12 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-02-06 10:51:50 -0800
commite1bd14f9331b8622b89c3e7992e2ea6d3678ea43 (patch)
tree00b2eea206d78bafb6218a8c1e8321aa64459f99
parentedje_example: fix compile instruction (diff)
downloadefl-e1bd14f9331b8622b89c3e7992e2ea6d3678ea43.tar.gz
evas: harden check on map presence.
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f83f1c1e23..b245454be8 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;