cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8b01f7b06d0cae28a86d9a749a1dcaea4a33ef24
commit 8b01f7b06d0cae28a86d9a749a1dcaea4a33ef24 Author: Cedric Bail <[email protected]> Date: Mon Oct 28 18:44:26 2013 +0900 evas: fix possible memory leak in the ellipsis code. --- src/lib/evas/canvas/evas_object_text.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 1738a12..c479ddc 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -201,7 +201,13 @@ _evas_object_text_items_clean(Evas_Object_Protected_Data *obj, Evas_Object_Text } else { + /* It is not guaranteed that the ellipsis are still inside the items, so remove them by force */ + if (o->last_computed.ellipsis_start) + _evas_object_text_item_del(o, o->last_computed.ellipsis_start); o->last_computed.ellipsis_start = NULL; + + if (o->last_computed.ellipsis_end) + _evas_object_text_item_del(o, o->last_computed.ellipsis_end); o->last_computed.ellipsis_end = NULL; } while (o->items) @@ -1047,7 +1053,7 @@ _text_text_set(Eo *eo_obj, void *_pd, va_list *list) /* DO II */ /*Update bidi_props*/ - if (o->items) _evas_object_text_items_clear(o); + _evas_object_text_items_clear(o); _evas_object_text_recalc(eo_obj, text); eina_stringshare_replace(&o->cur.utf8_text, _text); --
