From 5249cccfcfb6c345a40dff2dee464d287fc69605 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 18 Sep 2013 19:56:15 +0200 Subject: Config path functions can return NULL It's quite unlikely, but functions like mp_find_user_config_file() can return NULL, e.g. if $HOME is unset. Fix all the code that didn't check for this correctly yet. --- mpvcore/mplayer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mpvcore/mplayer.c') diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index 381f3385fd..d9715e447f 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -637,9 +637,11 @@ static void mk_config_dir(char *subdir) { void *tmp = talloc_new(NULL); char *confdir = talloc_steal(tmp, mp_find_user_config_file("")); - if (subdir) - confdir = mp_path_join(tmp, bstr0(confdir), bstr0(subdir)); - mkdir(confdir, 0777); + if (confdir) { + if (subdir) + confdir = mp_path_join(tmp, bstr0(confdir), bstr0(subdir)); + mkdir(confdir, 0777); + } talloc_free(tmp); } -- cgit v1.2.3