From 9fab234064db56234918f76faa0afbf8e21c7e72 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 5 May 2021 19:44:01 +0100 Subject: [PATCH] evas - fix seg on setting immage src if invalid obj @fix --- src/lib/evas/canvas/efl_canvas_proxy.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c index 9f626868e9..d55cbc2c31 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.c +++ b/src/lib/evas/canvas/efl_canvas_proxy.c @@ -8,6 +8,11 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); + if (!obj) + { + WRN("Image source %p not valid", eo_obj); + return EINA_FALSE; + } if (obj->delete_me && eo_src) { WRN("Setting deleted object %p as image source %p", eo_src, eo_obj); @@ -16,6 +21,11 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src) if (eo_src) { Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); + if (!src) + { + WRN("Setting object %p not valid", eo_src); + return EINA_FALSE; + } if (src->delete_me) { WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);