summaryrefslogtreecommitdiffstats
path: root/demux
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 /demux
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 'demux')
-rw-r--r--demux/demux.h1
-rw-r--r--demux/demux_subreader.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h
index 7a663684f9..6f9437f2d3 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -152,6 +152,7 @@ struct demuxer_params {
int matroska_wanted_segment;
bool *matroska_was_valid;
struct ass_library *ass_library;
+ bool expect_subtitle;
};
typedef struct demuxer {
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 6bb39c960d..1fa449d7f0 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -1337,6 +1337,9 @@ static int d_open_file(struct demuxer *demuxer, enum demux_check check)
if (check > DEMUX_CHECK_REQUEST)
return -1;
+ if (!demuxer->params || !demuxer->params->expect_subtitle)
+ return -1;
+
struct stream *ps = read_probe_stream(demuxer->stream, PROBE_SIZE);
struct subreader sr;