From be7e04f7198ed6092a1d1e54e867df9b2c6247a4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 19 Mar 2013 01:54:45 +0100 Subject: demux_mf: fix crashes when '*' matches directories Doing 'mpv mf://*' in a file with directories would crash, because even though directories are skipped, the corresponding file entry is just left at NULL, leading to a segfault on access. So explicitly skip NULL entries. --- demux/demux_mf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'demux/demux_mf.c') diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 236718de36..0db3fb8add 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -70,8 +70,11 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){ if (mf->streams) entry_stream = mf->streams[mf->curr_frame]; struct stream *stream = entry_stream; - if (!stream) - stream = open_stream(mf->names[mf->curr_frame], demuxer->opts, NULL); + if (!stream) { + char *filename = mf->names[mf->curr_frame]; + if (filename) + stream = open_stream(filename, demuxer->opts, NULL); + } if (stream) { stream_seek(stream, 0); @@ -87,7 +90,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){ talloc_free(data.start); } - if (stream != entry_stream) + if (stream && stream != entry_stream) free_stream(stream); mf->curr_frame++; -- cgit v1.2.3