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

evas/cserve2: fix crash in cserve2's font loading mechanism. 

Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
This commit is contained in:
Jean-Philippe Andre 2013-06-04 19:49:30 +09:00 committed by Cedric Bail
parent e973be52f9
commit 5836f503e1
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lib/evas/common/evas_font_main.c
View File

@ -343,6 +343,18 @@ _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx)
fash->bucket[grp]->bucket[maj]->item[min].index = idx;
}
static void
_glyph_free(RGBA_Font_Glyph *fg)
{
if ((!fg) || (fg == (void *)(-1))) return;
FT_Done_Glyph(fg->glyph);
/* extension calls */
if (fg->ext_dat_free) fg->ext_dat_free(fg->ext_dat);
if (fg->glyph_out_free) fg->glyph_out_free(fg->glyph_out);
free(fg);
}
static void
_fash_glyph_free(Fash_Glyph_Map *fmap)
{
@ -353,11 +365,7 @@ _fash_glyph_free(Fash_Glyph_Map *fmap)
RGBA_Font_Glyph *fg = fmap->item[i];
if ((fg) && (fg != (void *)(-1)))
{
FT_Done_Glyph(fg->glyph);
/* extension calls */
if (fg->ext_dat_free) fg->ext_dat_free(fg->ext_dat);
if (fg->glyph_out_free) fg->glyph_out_free(fg->glyph_out);
free(fg);
_glyph_free(fg);
fmap->item[i] = NULL;
}
}
@ -443,10 +451,20 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
{
#ifdef EVAS_CSERVE2
if (fi->cs2_handler)
evas_cserve2_font_glyph_used(fi->cs2_handler, idx,
fi->hinting);
#endif
{
if (evas_cserve2_font_glyph_used(fi->cs2_handler, idx,
fi->hinting))
return fg;
else
{
_glyph_free(fg);
_fash_gl_add(fi->fash, idx, NULL);
}
}
else return fg;
#else
return fg;
#endif
}
}
// fg = eina_hash_find(fi->glyphs, &hindex);
@ -472,9 +490,8 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
if (fi->runtime_rend & FONT_REND_WEIGHT)
FT_GlyphSlot_Embolden(fi->src->ft.face->glyph);
fg = malloc(sizeof(struct _RGBA_Font_Glyph));
fg = calloc(1, sizeof(RGBA_Font_Glyph));
if (!fg) return NULL;
memset(fg, 0, (sizeof(struct _RGBA_Font_Glyph)));
FTLOCK();
error = FT_Get_Glyph(fi->src->ft.face->glyph, &(fg->glyph));