summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-08-07 06:20:35 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-08-07 06:20:35 +0000
commit07742ef737ca5bb88ebdf68163da0331426e5006 (patch)
tree615fe7b06782ad0a37aa455883a0cecf4627ddd0 /legacy
parent2547d07ea35c382f6a7dcd191f21516cac5c7240 (diff)
edje: fix memory leak when alias are present.
SVN revision: 74960
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/ChangeLog4
-rw-r--r--legacy/edje/NEWS1
-rw-r--r--legacy/edje/src/lib/edje_load.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 38512aba5b..cd499375b1 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -544,3 +544,7 @@
5442012-08-06 Cedric Bail 5442012-08-06 Cedric Bail
545 545
546 * Call edje_object_message_signal_process also on GROUP part Edje object. 546 * Call edje_object_message_signal_process also on GROUP part Edje object.
547
5482012-08-07 Cedric Bail
549
550 * Fix memory leak when Edje file have alias defined.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 8d3403d458..eac793e963 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -30,6 +30,7 @@ Fixes:
30 * Fix shutdown of Edje_Multisense. 30 * Fix shutdown of Edje_Multisense.
31 * Reduce potential reentrant issue when using edje_object_signal_emit. 31 * Reduce potential reentrant issue when using edje_object_signal_emit.
32 * Call edje_object_message_signal_process also on GROUP part Edje object. 32 * Call edje_object_message_signal_process also on GROUP part Edje object.
33 * Remove memory leak when alias are present in the edj file.
33 34
34Edje 1.2.0 35Edje 1.2.0
35 36
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index e6efc9658e..c7ae973106 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -1446,6 +1446,9 @@ _edje_collection_free(Edje_File *edf, Edje_Part_Collection *ec, Edje_Part_Collec
1446 if (ec->script) embryo_program_free(ec->script); 1446 if (ec->script) embryo_program_free(ec->script);
1447 _edje_lua2_script_unload(ec); 1447 _edje_lua2_script_unload(ec);
1448 1448
1449 eina_hash_free(ec->alias);
1450 eina_hash_free(ec->aliased);
1451
1449 /* Destroy all part and description. */ 1452 /* Destroy all part and description. */
1450 eina_mempool_del(ce->mp.RECTANGLE); 1453 eina_mempool_del(ce->mp.RECTANGLE);
1451 eina_mempool_del(ce->mp.TEXT); 1454 eina_mempool_del(ce->mp.TEXT);