edje_entry: Fix crash on selection.

evas: properly clean up all memory.
Summary:
When text is selected, crash happens due to double free as rectangles are freed both in _sel_update
and _evas_textblock_selection_iterator_free hence removing free from _sel_update.
upstream commit: 6bd863cf4ffb46f0267e96844cea37a95599e9de

Signed-off-by: Pankaj Mittal <m.pankaj@samsung.com>
Change-Id: Ib5afa8be821e983aa2e3c562c5f8df70151e5e00

diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 102c6e2..29f4bd0 100644 (file)
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -727,7 +727,6 @@ _sel_update(Edje *ed, Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entr
                   evas_object_move(sel->obj_fg, x + r->x, y + r->y);
                   evas_object_resize(sel->obj_fg, r->w, r->h);
                }
-             free(r);
           }
         eina_iterator_free(range);
 

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 4de1e69..af5c020 100644 (file)
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -697,8 +697,10 @@ _evas_textblock_selection_iterator_get_container(Evas_Textblock_Selection_Iterat
 static void
 _evas_textblock_selection_iterator_free(Evas_Textblock_Selection_Iterator *it)
 {
-   while (it->list)
-     it->list = eina_list_remove_list(it->list, it->list);
+   Evas_Textblock_Rectangle *tr;
+
+   EINA_LIST_FREE(it->list, tr)
+      free(tr);
    EINA_MAGIC_SET(&it->iterator, 0);
    free(it);
 }