mirror of
https://github.com/mpv-player/mpv
synced 2025-03-03 04:37:54 +00:00
Bugfix: glyph and bitmap pointers could be left uninitialized after
get_glyph(). Based on a patch by Stanislav Maslovski (stanislav d maslovski a gmail d com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22063 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
120df8df33
commit
7c137f48c6
@ -1233,6 +1233,9 @@ static int get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
|
||||
// not found, get a new outline glyph from face
|
||||
// mp_msg(MSGT_ASS, MSGL_INFO, "miss, index = %d, symbol = %c, adv = (%d, %d)\n", index, symbol, advance->x, advance->y);
|
||||
|
||||
info->outline_glyph = 0;
|
||||
info->bm = info->bm_o = info->bm_s = 0;
|
||||
|
||||
info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol);
|
||||
if (!info->glyph)
|
||||
return 0;
|
||||
@ -1246,12 +1249,8 @@ static int get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
|
||||
if (error) {
|
||||
mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FT_Glyph_Stroke_Error, error);
|
||||
}
|
||||
} else {
|
||||
info->outline_glyph = 0;
|
||||
}
|
||||
|
||||
info->bm = info->bm_o = info->bm_s = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user