]> granicus.if.org Git - libass/commitdiff
Bugfix: strdup of NULL value.
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 29 Aug 2006 18:15:48 +0000 (18:15 +0000)
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 29 Aug 2006 18:15:48 +0000 (18:15 +0000)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2

libass/ass_mp.c

index 1d5061dfec875ac6e7eb631fbc1b0ca1d8df148a..a01cdce334bd31975260cca421ca362d0e0b775a 100644 (file)
@@ -48,7 +48,7 @@ ass_track_t* ass_read_subdata(sub_data* subdata, double fps) {
        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