summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-02-04 13:18:55 +0530
committerAmitesh Singh <amitesh.sh@samsung.com>2017-02-04 13:30:49 +0530
commit1a798c37dc9258a1e322a740ee07ef1da285e2d2 (patch)
treec3a07afd23eac70d8da36bcd94e0f48ea2d7cbef /src/lib/edje
parent51638afbebc225b5a550eb87a0e74c53d866ed2e (diff)
edje: unset timer pointer after delete.
Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_callbacks.c1
-rw-r--r--src/lib/edje/edje_load.c1
-rw-r--r--src/lib/edje/edje_program.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 8a320933c9..88154891fa 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -437,6 +437,7 @@ _edje_pending_timer_cb(void *data)
437 pp = data; 437 pp = data;
438 pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp); 438 pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp);
439 _edje_program_run(pp->edje, pp->program, 1, "", ""); 439 _edje_program_run(pp->edje, pp->program, 1, "", "");
440 pp->timer = NULL;
440 free(pp); 441 free(pp);
441 return ECORE_CALLBACK_CANCEL; 442 return ECORE_CALLBACK_CANCEL;
442} 443}
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 01030e30db..c87958685b 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -2051,6 +2051,7 @@ _edje_file_del(Edje *ed)
2051 EINA_LIST_FREE(ed->pending_actions, pp) 2051 EINA_LIST_FREE(ed->pending_actions, pp)
2052 { 2052 {
2053 ecore_timer_del(pp->timer); 2053 ecore_timer_del(pp->timer);
2054 pp->timer = NULL;
2054 free(pp); 2055 free(pp);
2055 } 2056 }
2056 } 2057 }
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 232dcb3ccf..1482fa4c9c 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -873,6 +873,7 @@ low_mem_current:
873 { 873 {
874 ed->pending_actions = eina_list_remove(ed->pending_actions, pp); 874 ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
875 ecore_timer_del(pp->timer); 875 ecore_timer_del(pp->timer);
876 pp->timer = NULL;
876 free(pp); 877 free(pp);
877 // goto done; 878 // goto done;
878 } 879 }