cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3c55dccb25c7fab256dc5f7b4e309c298ddc80ae
commit 3c55dccb25c7fab256dc5f7b4e309c298ddc80ae Author: Srivardhan Hebbar <[email protected]> Date: Wed Dec 10 11:19:59 2014 +0100 edge: fix memory leak and removed redundant return statement. Summary: The name was freed after exit, so freeing it before and also freeing in a error case. There was a return statement after exit, thought it was redundant and removed. @fix Signed-off-by: Srivardhan Hebbar <[email protected]> Reviewers: devilhorns, cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1758 Signed-off-by: Cedric BAIL <[email protected]> --- src/bin/edje/edje_cc_handlers.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 31297ac..7cc08a0 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -4322,6 +4322,7 @@ st_collections_group_parts_part_inherit(void) if (pc->parts[i] == current_part) { ERR("Cannot inherit from same part '%s' in group '%s'", name, current_de->entry); + free(name); exit(-1); } pname = current_part->name; @@ -4336,9 +4337,8 @@ st_collections_group_parts_part_inherit(void) } ERR("Cannot inherit non-existing part '%s' in group '%s'", name, current_de->entry); - exit(-1); - free(name); + exit(-1); } static void @@ -9675,7 +9675,6 @@ st_collections_group_parts_part_description_map_color(void) { ERR("not enough memory"); exit(-1); - return; } *color = tmp; --
