enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

evas - textgrid - guard against null/empty glyphs 

not sure how someone got to this point - but this should not be null,
so don't crash if it is.

@fix
This commit is contained in:
Carsten Haitzler 2022-05-16 18:36:56 +01:00
parent e9e40eb610
commit 5f85967da1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/evas/canvas/evas_object_textgrid.c
View File

@ -379,7 +379,8 @@ _drop_glyphs_ref(const void *container EINA_UNUSED, void *data, void *fdata)
Evas_Font_Array_Data *fad = data;
Evas_Public_Data *pd = fdata;
evas_common_font_glyphs_unref(fad->glyphs);
if (fad->glyphs)
evas_common_font_glyphs_unref(fad->glyphs);
eina_array_pop(&pd->glyph_unref_queue);
return EINA_TRUE;
@ -553,10 +554,12 @@ evas_object_textgrid_render(Evas_Object *eo_obj EINA_UNUSED,
props = &text->text_props;
evas_common_font_draw_prepare(props);
evas_common_font_glyphs_ref(props->glyphs);
evas_unref_queue_glyph_put(obj->layer->evas,
props->glyphs);
if (props->glyphs)
{
evas_common_font_glyphs_ref(props->glyphs);
evas_unref_queue_glyph_put(obj->layer->evas,
props->glyphs);
}
fad = eina_inarray_grow(texts->array, 1);
if (!fad)