From a98aaaae64f88909a5cd8f58e42067a977134d8b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:45:17 +0000 Subject: [PATCH] Evas text: Fixed a segfault with text objects with a font not yet set (but with text set). SVN revision: 56537 --- legacy/evas/src/lib/canvas/evas_object_text.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index 333b50ed6d..18d5654ead 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -530,12 +530,15 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o, evas_common_text_props_script_set(&it->text_props, it->text); ENFN->font_shape(ENDT, o->engine_data, it->text, &it->text_props, o->bidi_par_props, it->text_pos, len); - ENFN->font_string_size_get(ENDT, - o->engine_data, - it->text, &it->text_props, - &it->w, &it->h); - it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text, - &it->text_props); + if (o->engine_data) + { + ENFN->font_string_size_get(ENDT, + o->engine_data, + it->text, &it->text_props, + &it->w, &it->h); + it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text, + &it->text_props); + } o->items = (Evas_Object_Text_Item *) eina_inlist_append(EINA_INLIST_GET(o->items), EINA_INLIST_GET(it)); return it;