From 4e8e822ba68fb195a2ddee93f6809b9dadac58ba Mon Sep 17 00:00:00 2001 From: Kovensky Date: Thu, 30 Jul 2009 21:02:55 -0300 Subject: [PATCH] Don't crash on load_font_ft Based on http://oss.netfarm.it/mplayer/patches/xx_fontconfig_noconf_nocrash.diff --- libvo/font_load_ft.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index f44c2c5796..4aa1b7abfa 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -1164,7 +1164,10 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcDefaultSubstitute(fc_pattern); fc_pattern2 = fc_pattern; - fc_pattern = FcFontMatch(0, fc_pattern, 0); + if (!(fc_pattern = FcFontMatch(0, fc_pattern, 0))) { + *fontp=read_font_desc_ft(font_name, 0, width, height, font_scale_factor); + return; + } FcPatternDestroy(fc_pattern2); FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable); if (scalable != FcTrue) { -- 2.11.4.GIT