From acbcc7da6a0297323adc3b1bc6d63c8b1009373d Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 9 Feb 2014 19:39:30 +0900 Subject: [PATCH] in case font_instance is null in text_props... avoid using it --- src/lib/evas/canvas/evas_object_textblock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c717ac404c..caf7c5531e 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -10747,8 +10747,10 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED, { \ Evas_Object_Textblock_Text_Item *titr = \ (Evas_Object_Textblock_Text_Item *)itr; \ - yoff = \ - evas_common_font_instance_max_ascent_get(titr->text_props.font_instance) +\ + int ascent = 0; \ + if (titr->text_props.font_instance) \ + ascent = evas_common_font_instance_max_ascent_get(titr->text_props.font_instance); \ + yoff = ascent + \ (itr->format->valign * (ln->h - itr->h)); \ } \ else yoff = itr->format->valign * (ln->h - itr->h); \