ecore: Avoid double free with promises

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index b512194..2782bb2 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -1690,6 +1690,9 @@ _ecore_main_content_clear(Efl_Loop_Data *pd)
    EINA_LIST_FREE(tmp, promise)
      ecore_loop_promise_fulfill(promise);
 
+   // FIXME
+   __eina_promise_cancel_all();
+
    while (pd->fd_handlers)
      {
         Ecore_Fd_Handler *fdh = pd->fd_handlers;

diff --git a/src/lib/ecore/efl_promise.c b/src/lib/ecore/efl_promise.c
index 17e9548..3e522b4 100644 (file)
--- a/src/lib/ecore/efl_promise.c
+++ b/src/lib/ecore/efl_promise.c
@@ -824,8 +824,11 @@ _efl_promise_all_free(Efl_Promise_All *all)
    EINA_ARRAY_ITER_NEXT(&all->members, i, fa, iterator)
      {
         if (fa->d)
-          EINA_REFCOUNT_UNREF(fa->d)
-            _efl_promise_msg_free(fa->d);
+          {
+             EINA_REFCOUNT_UNREF(fa->d)
+               _efl_promise_msg_free(fa->d);
+             fa->d = NULL;
+          }
      }
    efl_del(all->promise);
    all->promise = NULL;
@@ -839,8 +842,11 @@ _efl_promise_all_die(void *data, const Efl_Event *ev EINA_UNUSED)
 
    while ((fa = eina_array_pop(&all->members)))
      {
-        EINA_REFCOUNT_UNREF(fa->d)
-          _efl_promise_msg_free(fa->d);
+        if (fa->d)
+          {
+             EINA_REFCOUNT_UNREF(fa->d)
+               _efl_promise_msg_free(fa->d);
+          }
         assert(fa->f == NULL);
         free(fa);
      }