devilhorns pushed a commit to branch master.

commit b0fa8b65639c5a8f72b29f8b86814224537ef936
Author: Chris Michael <[email protected]>
Date:   Mon Jul 8 07:50:35 2013 +0100

    Remove timer and animator from the list Before freeing the variables.
    
    NB: Fixes Coverity CID1039906 and CID1039906
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/lib/edje/edje_var.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_var.c b/src/lib/edje/edje_var.c
index d4448b6..5e40f62 100644
--- a/src/lib/edje/edje_var.c
+++ b/src/lib/edje/edje_var.c
@@ -242,9 +242,9 @@ _edje_var_shutdown(Edje *ed)
        Edje_Var_Timer *et;
 
        et = eina_list_data_get(ed->var_pool->timers);
+       ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
        ecore_timer_del(et->timer);
        free(et);
-       ed->var_pool->timers = eina_list_remove(ed->var_pool->timers, et);
      }
    if (ed->var_pool->animators)
      {
@@ -263,8 +263,8 @@ _edje_var_shutdown(Edje *ed)
        Edje_Var_Animator *ea;
 
        ea = eina_list_data_get(ed->var_pool->animators);
-       free(ea);
        ed->var_pool->animators = eina_list_remove(ed->var_pool->animators, ea);
+       free(ea);
      }
    free(ed->var_pool);
    ed->var_pool = NULL;

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev

Reply via email to