summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-08 23:50:21 +0100
committerwm4 <wm4@nowhere>2013-02-09 00:21:18 +0100
commitc1ddfb59076e9b568484b97f10b4eadeb48384e3 (patch)
treee8fb4e0f60c810cc834954f9c5b138b897ec0ac0 /sub
parenta36e03781c0bbfaae4a04f3b57db4df5040d31d0 (diff)
downloadmpv-c1ddfb59076e9b568484b97f10b4eadeb48384e3.tar.bz2
mpv-c1ddfb59076e9b568484b97f10b4eadeb48384e3.tar.xz
Check return values of some mp_find_..._config_file function calls for NULL
Diffstat (limited to 'sub')
-rw-r--r--sub/ass_mp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index ae069662c6..2312eaeff5 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -262,7 +262,7 @@ void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts)
char *default_font = mp_find_user_config_file("subfont.ttf");
char *config = mp_find_config_file("fonts.conf");
- if (!mp_path_exists(default_font)) {
+ if (default_font && !mp_path_exists(default_font)) {
talloc_free(default_font);
default_font = NULL;
}
@@ -334,7 +334,8 @@ ASS_Library *mp_ass_init(struct MPOpts *opts)
char *path = mp_find_user_config_file("fonts");
priv = ass_library_init();
ass_set_message_cb(priv, message_callback, NULL);
- ass_set_fonts_dir(priv, path);
+ if (path)
+ ass_set_fonts_dir(priv, path);
ass_set_extract_fonts(priv, opts->use_embedded_fonts);
talloc_free(path);
return priv;