enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore_timer: add NULL checking for timer data. 

When timer is not created, a crash occurs.
For example, when user create ecore timer in the pthread..
Of course this is not the correct usage, but printing ERR message is enough.

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D10714
This commit is contained in:
Hosang Kim 2019-11-22 09:16:47 +00:00 committed by Marcel Hollerbach
parent a21f615a19
commit 09fd7ca8d6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/ecore/ecore_timer.c
View File

@ -15,6 +15,17 @@
#define ECORE_TIMER_CHECK(obj) if (!efl_isa((obj), MY_CLASS)) return
#define EFL_LOOP_TIMER_DATA_GET(o, td) \
Efl_Loop_Timer_Data *td = efl_data_scope_safe_get(o, EFL_LOOP_TIMER_CLASS)
#define EFL_LOOP_TIMER_DATA_GET_OR_RETURN(o, ptr, ...) \
EFL_LOOP_TIMER_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \
{ \
ERR("No data for timer %p", o); \
return __VA_ARGS__; \
}
struct _Ecore_Timer_Legacy
{
Ecore_Task_Cb func;
@ -178,7 +189,6 @@ EAPI Ecore_Timer *
ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
{
Ecore_Timer_Legacy *legacy;
Efl_Loop_Timer_Data *td;
Eo *timer;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@ -194,7 +204,7 @@ ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
timer = efl_add(MY_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
efl_loop_timer_interval_set(efl_added, in));
td = efl_data_scope_get(timer, MY_CLASS);
EFL_LOOP_TIMER_DATA_GET_OR_RETURN(timer, td, NULL);
td->legacy = legacy;
return timer;
}
@ -203,7 +213,6 @@ EAPI Ecore_Timer *
ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
{
Ecore_Timer_Legacy *legacy;
Efl_Loop_Timer_Data *td;
Eo *timer;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@ -220,7 +229,7 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
efl_loop_timer_loop_reset(efl_added),
efl_loop_timer_interval_set(efl_added, in));
td = efl_data_scope_get(timer, MY_CLASS);
EFL_LOOP_TIMER_DATA_GET_OR_RETURN(timer, td, NULL);
td->legacy = legacy;
return timer;
}
@ -228,14 +237,12 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
EAPI void *
ecore_timer_del(Ecore_Timer *timer)
{
Efl_Loop_Timer_Data *td;
void *data;
if (!timer) return NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
td = efl_data_scope_safe_get(timer, MY_CLASS);
EFL_LOOP_TIMER_DATA_GET(timer, td);
// If legacy == NULL, this means double free or something
if ((!td) || (!td->legacy))
{