diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-09-26 18:00:05 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-10-04 09:54:06 -0400 |
| commit | 44084db9efdd1d9b3a6014f00f02793a62ef414d (patch) | |
| tree | b8f91fa205848b53802efd12693b0f71f5fca67c | |
| parent | 4df9fe30868f9641411e743933d11c319da069e4 (diff) | |
| download | efl-44084db9efdd1d9b3a6014f00f02793a62ef414d.tar.gz | |
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.c | 9 |
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 07193790ba..df88407086 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1125,8 +1125,13 @@ _efl_canvas_object_efl_object_invalidate(Eo *eo_obj, Evas_Object_Protected_Data } } - if (obj->cur && obj->cur->clipper) evas_object_clip_unset(eo_obj); - if (obj->prev) _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE); + if (obj->cur) + { + if (obj->cur->clipper) + evas_object_clip_unset(eo_obj); + if (obj->prev) + _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE); + } if (obj->map) evas_object_map_set(eo_obj, NULL); |