naviframe_effect: Fix to free data after dereferencing data.submit/tizen_3.0/20170102.044407submit/tizen_3.0.m2/20170104.093756accepted/tizen/3.0/mobile/20170102.095544accepted/tizen/3.0.m2/mobile/20170105.025827tizen_3.0.m2accepted/tizen_3.0.m2_mobile

Change-Id: I5e261291f1e67e5ef05a395c0b1ca6fe1c504cb1

1 files changed, 12 insertions, 8 deletions

diff --git a/naviframe_effect/naviframe_effect.c b/naviframe_effect/naviframe_effect.c
index 528e690..ed6ae29 100644
--- a/naviframe_effect/naviframe_effect.c
+++ b/naviframe_effect/naviframe_effect.c
@@ -181,11 +181,12 @@ tizen_pop_effect_cur_view(Evas_Object *nf, Evas_Object *cur_view)
         //Delete nf_data and Create it later.
         evas_object_data_del(cur_nd->nf, cur_key);
         nd_list = eina_list_remove(nd_list, cur_nd);
-        free(cur_nd);
 
-        /* Delete transit after dealocating nf_data.
+        /* Delete transit after removing nf_data from naviframe.
            Because _tizen_transit_del_cb also dealocates nf_data. */
         elm_transit_del(cur_nd->transit);
+
+        free(cur_nd);
      }
 
    cur_nd = evas_object_data_get(nf, cur_key);
@@ -258,11 +259,12 @@ tizen_pop_effect_prev_view(Evas_Object *nf, Evas_Object *prev_view)
         //Delete nf_data and Create it later.
         evas_object_data_del(prev_nd->nf, prev_key);
         nd_list = eina_list_remove(nd_list, prev_nd);
-        free(prev_nd);
 
-        /* Delete transit after dealocating nf_data.
+        /* Delete transit after removing nf_data from naviframe.
            Because _tizen_transit_del_cb also dealocates nf_data. */
         elm_transit_del(prev_nd->transit);
+
+        free(prev_nd);
      }
 
    prev_nd = evas_object_data_get(nf, prev_key);
@@ -382,11 +384,12 @@ tizen_push_effect_cur_view(Evas_Object *nf, Evas_Object *cur_view)
         //Delete nf_data and Create it later.
         evas_object_data_del(cur_nd->nf, cur_key);
         nd_list = eina_list_remove(nd_list, cur_nd);
-        free(cur_nd);
 
-        /* Delete transit after dealocating nf_data.
+        /* Delete transit after removing nf_data from naviframe.
            Because _tizen_transit_del_cb also dealocates nf_data. */
         elm_transit_del(cur_nd->transit);
+
+        free(cur_nd);
      }
 
    cur_nd = evas_object_data_get(nf, cur_key);
@@ -462,11 +465,12 @@ tizen_push_effect_new_view(Evas_Object *nf, Evas_Object *new_view)
         //Delete nf_data and Create it later.
         evas_object_data_del(new_nd->nf, new_key);
         nd_list = eina_list_remove(nd_list, new_nd);
-        free(new_nd);
 
-        /* Delete transit after dealocating nf_data.
+        /* Delete transit after removing nf_data from naviframe.
            Because _tizen_transit_del_cb also dealocates nf_data. */
         elm_transit_del(new_nd->transit);
+
+        free(new_nd);
      }
 
    new_nd = evas_object_data_get(nf, new_key);