[MPlayer-cvslog] r22063 - trunk/libass/ass_render.c

[eugeni]

Author: eugeni
Date: Mon Jan 29 18:08:29 2007
New Revision: 22063

Modified:
   trunk/libass/ass_render.c

Log:
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).


Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Mon Jan 29 18:08:29 2007
@@ -1233,6 +1233,9 @@
 	// 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 @@
 		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;
 }