summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammad Alsaleh <CE.Mohammad.AlSaleh@gmail.com>2013-10-11 04:24:50 +0300
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-10-11 18:01:47 +0200
commit65a39772829b67c3dfb77aa35d51a3c35e49c050 (patch)
treec42953d1cca949095ffc2a397932ae54a87c65aa
parent177c89d948d46408d9e931fd42be07cf727f7842 (diff)
downloadmpv-65a39772829b67c3dfb77aa35d51a3c35e49c050.tar.bz2
mpv-65a39772829b67c3dfb77aa35d51a3c35e49c050.tar.xz
mpvcore/playlist.c: Avoid NULL reference in playlist_add_base_path()
Before this patch, those will cause a crash: mpv -playlist /dev/null mpv -playlist <(bla) # if the result of bla is empty Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh@gmail.com> Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
-rw-r--r--mpvcore/playlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mpvcore/playlist.c b/mpvcore/playlist.c
index 3396a5d78b..818aa45a8c 100644
--- a/mpvcore/playlist.c
+++ b/mpvcore/playlist.c
@@ -178,7 +178,7 @@ struct playlist_entry *playlist_get_next(struct playlist *pl, int direction)
void playlist_add_base_path(struct playlist *pl, bstr base_path)
{
- if (base_path.len == 0 || bstrcmp0(base_path, ".") == 0)
+ if (!pl || base_path.len == 0 || bstrcmp0(base_path, ".") == 0)
return;
for (struct playlist_entry *e = pl->first; e; e = e->next) {
if (!mp_is_url(bstr0(e->filename))) {