From e1bd14f9331b8622b89c3e7992e2ea6d3678ea43 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 6 Feb 2017 10:45:12 -0800 Subject: [PATCH] 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 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;