summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-04 19:00:01 +0100
committerwm4 <wm4@nowhere>2014-01-04 19:00:01 +0100
commit6534839154b9644a0019baf155f9bda542aa6e75 (patch)
treecbc8f396353c8380bf4f05e894ec1f5b7c810eeb /player
parent5a36d027f0bade2a7edd10c07716b196abaf8652 (diff)
downloadmpv-6534839154b9644a0019baf155f9bda542aa6e75.tar.bz2
mpv-6534839154b9644a0019baf155f9bda542aa6e75.tar.xz
demux_subreader: reject file if not opened by --sub
demux_subreader.c contains the old MPlayer subtitle parser, and I have absolutely no confidence in this (very crappy) code. There might be one or two security risks associated with running that code on arbitrary input.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 14faeb08c9..f35c63fa38 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -776,6 +776,7 @@ static struct track *open_external_file(struct MPContext *mpctx, char *filename,
opts->stream_cache_seek_min_percent);
struct demuxer_params params = {
.ass_library = mpctx->ass_library, // demux_libass requires it
+ .expect_subtitle = filter == STREAM_SUB,
};
struct demuxer *demuxer =
demux_open(stream, demuxer_name, &params, mpctx->global);