summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <devilhorns@comcast.net>2020-03-05 08:28:05 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-03-06 13:30:40 +0100
commit2f4d209181adb49222f5da4446f3e41d1c28dc50 (patch)
tree700d2b0bb7cbf869252f5316d800d330ee797086
parent5e23d3983a4c794872c96f5a15b34af0f3112007 (diff)
downloadefl-2f4d209181adb49222f5da4446f3e41d1c28dc50.tar.gz
evas_object_intercept: Use efl_data_scope_safe_get
As per mailing list discussion, This macro is apparently a forward facing API so we should be using efl_data_scope_safe_get in the event that the API receives an object of the wrong type (which would have caused a crash previously). Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11450
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index 298a76c74a..325359176c 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -263,7 +263,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj,
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
return; \
MAGIC_CHECK_END(); \
- Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
+ Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
if (!func) return; \
evas_object_intercept_init(obj); \
if (!obj->interceptors) return; \
@@ -280,7 +280,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj,
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
return NULL; \
MAGIC_CHECK_END(); \
- Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
+ Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); \
if (!func) return NULL; \
if (!obj->interceptors) return NULL; \
obj->interceptors->Lower_Type.func = NULL; \