[MPlayer-cvslog] r28976 - trunk/libass/ass_fontconfig.c

[eugeni]

Author: eugeni
Date: Mon Mar 16 20:26:19 2009
New Revision: 28976

Log:
Fix uninitialized memory access in ass_fontconfig.

This fixes hangups with plaintext subtitles happening when
the first subtitle is about to be displayed.

Modified:
   trunk/libass/ass_fontconfig.c

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	Mon Mar 16 18:12:29 2009	(r28975)
+++ trunk/libass/ass_fontconfig.c	Mon Mar 16 20:26:19 2009	(r28976)
@@ -160,11 +160,13 @@ static char* _select_font(fc_instance_t*
 		goto error;
 
 #if (FC_VERSION >= 20297)
+	if (!treat_family_as_pattern) {
 	// Remove all extra family names from original pattern.
 	// After this, FcFontRenderPrepare will select the most relevant family
 	// name in case there are more than one of them.
 	for (; family_cnt > 1; --family_cnt)
 		FcPatternRemove(pat, FC_FAMILY, family_cnt - 1);
+	}
 #endif
 
 	rpat = FcFontRenderPrepare(priv->config, pat, fset->fonts[curf]);