raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4b431d3638a13ee80b3465fc353a6f5bfcb3ba9c
commit 4b431d3638a13ee80b3465fc353a6f5bfcb3ba9c Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Aug 14 18:14:08 2014 +0900 evas font - fix null access of font format possibility this fixes NULL access in CID 1099705, 1099703, 1099704 --- src/lib/evas/canvas/evas_object_textblock.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index ae1466c..fb59cee 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -2618,12 +2618,13 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj, } else { - Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - asc = - ENFN->font_ascent_get(ENDT, fmt->font.font); - desc = - ENFN->font_descent_get(ENDT, fmt->font.font); + if (fmt) + { + Evas_Object_Protected_Data *obj = + eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + asc = ENFN->font_ascent_get(ENDT, fmt->font.font); + desc = ENFN->font_descent_get(ENDT, fmt->font.font); + } } if (ascent && (asc > *ascent)) @@ -2631,7 +2632,7 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj, if (descent && (desc > *descent)) *descent = desc; - _layout_format_ascent_descent_adjust(eo_obj, ascent, descent, fmt); + if (fmt) _layout_format_ascent_descent_adjust(eo_obj, ascent, descent, fmt); } /** --
