[MPlayer-cvslog] r19594 - trunk/libass/ass_mp.c

[eugeni]

Author: eugeni
Date: Tue Aug 29 20:15:48 2006
New Revision: 19594

Modified:
   trunk/libass/ass_mp.c

Log:
Bugfix: strdup of NULL value.


Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	(original)
+++ trunk/libass/ass_mp.c	Tue Aug 29 20:15:48 2006
@@ -48,7 +48,7 @@
 	sid = ass_alloc_style(track);
 	style = track->styles + sid;
 	style->Name = strdup("Default");
-	style->FontName = font_fontconfig ? strdup(font_name) : strdup("Tahoma");
+	style->FontName = (font_fontconfig && font_name) ? strdup(font_name) : strdup("Tahoma");
 
 	fs = track->PlayResY * text_font_scale_factor / 100. / ass_internal_font_size_coeff;
 	// approximate autoscale coefficients