diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-14 18:14:08 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2014-08-14 18:14:08 +0900 |
| commit | 4b431d3638a13ee80b3465fc353a6f5bfcb3ba9c (patch) | |
| tree | d0b02bcabde91653c843afa0b01263f4dc378aa4 | |
| parent | 24a1c444b02f090578ac34774264fdaa6d102dd0 (diff) | |
| download | efl-4b431d3638a13ee80b3465fc353a6f5bfcb3ba9c.tar.gz | |
evas font - fix null access of font format possibility
this fixes NULL access in CID 1099705, 1099703, 1099704
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 15 |
1 files 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 ae1466cc6a..fb59cee003 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); } /** |