diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /libass/ass_font.c | |
parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz |
Merge svn changes up to r29412
Diffstat (limited to 'libass/ass_font.c')
-rw-r--r-- | libass/ass_font.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c index e129021439..73ee1c4a5b 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -127,6 +127,8 @@ static int add_face(void* fc_priv, ass_font_t* font, uint32_t ch) path = fontconfig_select(fc_priv, font->desc.family, font->desc.treat_family_as_pattern, font->desc.bold, font->desc.italic, &index, ch); + if (!path) + return -1; mem_idx = find_font(font->library, path); if (mem_idx >= 0) { |