summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-26 18:00:05 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-09-26 18:00:05 -0400
commit6443120eb37873ab6fe3c0d3dc5c54cc6fba3255 (patch)
tree582e4b39da0cc20993e185fa8c1f9fef2ce3b8ea
parent64799b32a155daf8bfaa001fb6faf437134699b4 (diff)
evas/object; fix null deref
Summary: _efl_canvas_object_clipper_prev_reset() derefs obj->cur CID 1396985 Depends on D10211 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10212
-rw-r--r--src/lib/evas/canvas/evas_object_main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index abd8a2d5e2..b6732eb9f8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1133,8 +1133,13 @@ _efl_canvas_object_efl_object_invalidate(Eo *eo_obj, Evas_Object_Protected_Data
1133 } 1133 }
1134 } 1134 }
1135 1135
1136 if (obj->cur && obj->cur->clipper) evas_object_clip_unset(eo_obj); 1136 if (obj->cur)
1137 if (obj->prev) _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE); 1137 {
1138 if (obj->cur->clipper)
1139 evas_object_clip_unset(eo_obj);
1140 if (obj->prev)
1141 _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE);
1142 }
1138 1143
1139 if (obj->map) evas_object_map_set(eo_obj, NULL); 1144 if (obj->map) evas_object_map_set(eo_obj, NULL);
1140 1145