From 07742ef737ca5bb88ebdf68163da0331426e5006 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 7 Aug 2012 06:20:35 +0000 Subject: [PATCH] edje: fix memory leak when alias are present. SVN revision: 74960 --- legacy/edje/ChangeLog | 4 ++++ legacy/edje/NEWS | 1 + legacy/edje/src/lib/edje_load.c | 3 +++ 3 files changed, 8 insertions(+) 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 @@ 2012-08-06 Cedric Bail * Call edje_object_message_signal_process also on GROUP part Edje object. + +2012-08-07 Cedric Bail + + * 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: * Fix shutdown of Edje_Multisense. * Reduce potential reentrant issue when using edje_object_signal_emit. * Call edje_object_message_signal_process also on GROUP part Edje object. + * Remove memory leak when alias are present in the edj file. Edje 1.2.0 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 if (ec->script) embryo_program_free(ec->script); _edje_lua2_script_unload(ec); + eina_hash_free(ec->alias); + eina_hash_free(ec->aliased); + /* Destroy all part and description. */ eina_mempool_del(ce->mp.RECTANGLE); eina_mempool_del(ce->mp.TEXT);