From 7811b0e5b73fc3bd31071e1fad1c031d9b2ef138 Mon Sep 17 00:00:00 2001 From: Jeeyong Um Date: Tue, 7 Nov 2017 00:34:32 +0900 Subject: [PATCH] edje_pick: Fix segfault due to wrong memory free --- src/bin/edje/edje_pick.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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,20 +256,20 @@ _edje_pick_cleanup(Eina_List *ifs, Edje_File *out_file, Edje_Pick_Status s) if (p->edf) _edje_cache_file_unref(p->edf); + 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); + } + free(p); } - 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); - } - switch (s) { case EDJE_PICK_OUT_FILENAME_MISSING: