github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

font_load_ft.c: fix possible crash with recent Fontconfig

Browse Source 
Calling FcFontMatch with last argument NULL triggers an assertion
failure in latest libfontconfig (2.9.0). Change the code to use a
dummy address, like another nearby call to FcFontMatch already did.

Whether the code triggering the assertion failure was run depended on
font settings and/or available system fonts (the code looks like you'd
have to get a non-scalable font first). Thus it didn't usually happen
even with problematic libfontconfig version.
This commit is contained in:
Uoti Urpala 2012-05-17 17:38:00 +03:00
parent 95438e54b8
commit f63dbaddb6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sub/font_load_ft.c
View File

@ -1160,7 +1160,7 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n
FcConfigSubstitute(0, fc_pattern, FcMatchPattern); FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
FcDefaultSubstitute(fc_pattern); FcDefaultSubstitute(fc_pattern);
fc_pattern2 = fc_pattern; fc_pattern2 = fc_pattern;
fc_pattern = FcFontMatch(0, fc_pattern, 0); fc_pattern = FcFontMatch(0, fc_pattern, &result);
FcPatternDestroy(fc_pattern2); FcPatternDestroy(fc_pattern2);
} }
// s doesn't need to be freed according to fontconfig docs // s doesn't need to be freed according to fontconfig docs