diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-23 14:46:50 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-23 14:46:50 +0000 |
| commit | cdefa182a957a050fcaf7ceff3f34b909974c2ea (patch) | |
| tree | 524b731ab2c23555156e0b6a40e0b9681492f7cd /libass/ass_fontconfig.c | |
| parent | 3b0c7fbebbae5797500dc5bd3fb2c1285dbcc092 (diff) | |
| download | libass-cdefa182a957a050fcaf7ceff3f34b909974c2ea.tar.bz2 libass-cdefa182a957a050fcaf7ceff3f34b909974c2ea.tar.xz | |
Only use application font dir if library->fonts_dir is not NULL.
This can be the case if ass_set_fonts_dir() call is omitted, results in
segfault. Never happens in the current MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27126 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_fontconfig.c')
| -rw-r--r-- | libass/ass_fontconfig.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index ccbb470..3a012f5 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -423,6 +423,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con for (i = 0; i < library->num_fontdata; ++i) process_fontdata(priv, library, ftlibrary, i); + if (dir) { if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache); @@ -461,6 +462,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con if (!rc) { mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcConfigAppFontAddDirFailed); } + } priv->family_default = family ? strdup(family) : 0; priv->path_default = path ? strdup(path) : 0; |