diff options
author | Uoti Urpala <uau@mplayer2.org> | 2012-05-17 17:38:00 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2012-05-17 17:38:00 +0300 |
commit | f63dbaddb6de6add6d987dc28ca8771aca230451 (patch) | |
tree | fb7dd0f6c86c48fd9e4cbf9b97b76b9f2ec99d4b /sub | |
parent | 95438e54b8128061b1b8751943e69a5af2e338f1 (diff) | |
download | mpv-f63dbaddb6de6add6d987dc28ca8771aca230451.tar.bz2 mpv-f63dbaddb6de6add6d987dc28ca8771aca230451.tar.xz |
font_load_ft.c: fix possible crash with recent Fontconfig
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.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/font_load_ft.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/font_load_ft.c b/sub/font_load_ft.c index a501cfc750..eb6d70b657 100644 --- a/sub/font_load_ft.c +++ b/sub/font_load_ft.c @@ -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); FcDefaultSubstitute(fc_pattern); fc_pattern2 = fc_pattern; - fc_pattern = FcFontMatch(0, fc_pattern, 0); + fc_pattern = FcFontMatch(0, fc_pattern, &result); FcPatternDestroy(fc_pattern2); } // s doesn't need to be freed according to fontconfig docs |