timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eina: don't access dead promise. 

We do properly unref promise while calling all the then callback. There
is no need to check it a second time (which actually lead to a 100%
bad access).

T3759
This commit is contained in:
Cedric BAIL 2016-05-31 14:18:48 -07:00
parent bc0547a705
commit 9bcad265a7
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/eina/eina_promise.c
View File

@ -167,14 +167,14 @@ _eina_promise_then_calls(_Eina_Promise_Default_Owner* promise)
{
promise->promise.then_callbacks = eina_inlist_remove(promise->promise.then_callbacks, EINA_INLIST_GET(callback));
if (error)
{
if (callback->error_cb)
(*callback->error_cb)(callback->data, promise->promise.error, &promise->promise.vtable);
}
{
if (callback->error_cb)
(*callback->error_cb)(callback->data, promise->promise.error, &promise->promise.vtable);
}
else if (callback->callback)
{
(*callback->callback)(callback->data, &promise->value[0], &promise->promise.vtable);
}
{
(*callback->callback)(callback->data, &promise->value[0], &promise->promise.vtable);
}
free(callback);
_eina_promise_unref(&promise->promise);
}
@ -327,10 +327,6 @@ _eina_promise_finish(_Eina_Promise_Default_Owner* promise)
{
_eina_promise_then_calls(promise);
}
if(promise->promise.ref == 0)
{
_eina_promise_del(promise);
}
}
static Eina_Error