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

ecore timer - fuix up segv storm that has crept in with frees 

freeing already freed data, not clearing up pointers to freed data
once freed etc. etc. etc. - segv land. fix that up so we can use efl
again. :(
This commit is contained in:
Carsten Haitzler 2016-05-06 11:06:56 +09:00
parent 43a4411f43
commit a13570c17c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,8 +157,14 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data))
{
eo_del(event->obj);
free(legacy);
if (eo_key_data_get(event->obj, "_legacy"))
{
eo_key_del(event->obj, "_legacy");
eo_event_callback_del(event->obj, EFL_TIMER_EVENT_TICK,
_ecore_timer_legacy_tick, legacy),
free(legacy);
eo_del(event->obj);
}
}
return EO_CALLBACK_CONTINUE;
@ -219,8 +225,10 @@ ecore_timer_del(Ecore_Timer *timer)
legacy = eo_key_data_get(timer, "_legacy");
data = (void*) legacy->data;
free(legacy);
eo_key_del(timer, "_legacy");
eo_event_callback_del(timer, EFL_TIMER_EVENT_TICK,
_ecore_timer_legacy_tick, legacy),
free(legacy);
eo_del(timer);
return data;