RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

playlist: check for NULL on caller site

Browse Source 
Letting some playlist functions randomly accept NULL, while others do
not isn't such a good idea.
This commit is contained in:
wm4 2013-10-12 17:19:20 +02:00
parent 7ce464bef9
commit 38874b2f2e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mpvcore/playlist.c
View File

@ -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 (!pl || base_path.len == 0 || bstrcmp0(base_path, ".") == 0)
if (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))) {

3
mpvcore/playlist_parser.c
View File

@ -648,7 +648,8 @@ struct playlist *playlist_parse_file(const char *file, struct MPOpts *opts)
struct playlist *ret = do_parse(stream, true);
free_stream(stream);
playlist_add_base_path(ret, mp_dirname(file));
if (ret)
playlist_add_base_path(ret, mp_dirname(file));
return ret;