conr2d pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7811b0e5b73fc3bd31071e1fad1c031d9b2ef138
commit 7811b0e5b73fc3bd31071e1fad1c031d9b2ef138 Author: Jeeyong Um <[email protected]> Date: Tue Nov 7 00:34:32 2017 +0900 edje_pick: Fix segfault due to wrong memory free --- src/bin/edje/edje_pick.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c index e6971b4c35..bc92297675 100644 --- a/src/bin/edje/edje_pick.c +++ b/src/bin/edje/edje_pick.c @@ -256,18 +256,18 @@ _edje_pick_cleanup(Eina_List *ifs, Edje_File *out_file, Edje_Pick_Status s) if (p->edf) _edje_cache_file_unref(p->edf); - free(p); - } + EINA_LIST_FREE(p->fontlist, ft) + { + Edje_Font *st = ft->f; - EINA_LIST_FREE(p->fontlist, ft) - { - Edje_Font *st = ft->f; + eina_stringshare_del(st->name); + eina_stringshare_del(st->file); + free(ft->data); + free(st); + free(ft); + } - eina_stringshare_del(st->name); - eina_stringshare_del(st->file); - free(ft->data); - free(st); - free(ft); + free(p); } switch (s) --
