From eba8eeda78aa2e90fb38e8042194e7b1040cae49 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Fri, 5 Sep 2014 23:09:12 +1000 Subject: player: check for null in resume config search Signed-off-by: wm4 CC: @mpv-player/stable --- player/configfiles.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/player/configfiles.c b/player/configfiles.c index d1c79c9c9d..92f2c079ea 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -200,7 +200,8 @@ static char *mp_get_playback_resume_config_filename(struct mpv_global *global, if (!res) { res = mp_find_config_file(tmp, global, MP_WATCH_LATER_CONF); - res = talloc_asprintf(NULL, "%s/%s", res, conf); + if (res) + res = talloc_asprintf(NULL, "%s/%s", res, conf); } exit: -- cgit v1.2.3