enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

evas_data: Fix safety checks in evas_object_data 

This relies on efl_isa rather than the broken magic check
(by broken I mean it only checks for NULL).
This commit is contained in:
Jean-Philippe Andre 2016-09-07 16:44:03 +09:00
parent f06c8b08f3
commit 9e235faf90
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/evas/canvas/evas_data.c
View File

@ -1,35 +1,27 @@
#include "evas_common_private.h"
#include "evas_private.h"
EAPI void
evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
evas_object_data_set(Evas_Object *eo_obj, const char *key, const void *data)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
efl_key_data_set(obj, key, data);
if (!efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) return;
efl_key_data_set(eo_obj, key, data);
}
EAPI void *
evas_object_data_get(const Evas_Object *obj, const char *key)
evas_object_data_get(const Evas_Object *eo_obj, const char *key)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
void *data = NULL;
data = efl_key_data_get((Evas_Object *)obj, key);
return data;
if (!efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) return NULL;
return efl_key_data_get(eo_obj, key);
}
EAPI void *
evas_object_data_del(Evas_Object *obj, const char *key)
evas_object_data_del(Evas_Object *eo_obj, const char *key)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
void *data = NULL;
data = efl_key_data_get(obj, key);
efl_key_data_set(obj, key, NULL);
void *data;
if (!efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) return NULL;
data = efl_key_data_get(eo_obj, key);
efl_key_data_set(eo_obj, key, NULL);
return data;
}