summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-31 09:54:09 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-31 09:54:09 +0000
commit3241e6a208ae58c1a0f10b25cd12c0067e94ce2c (patch)
tree83af570479603b810edf4d3ced2468a145e3fd16 /libmpdemux
parentc4105bb7318eebd9368de2420071a90e90a5f1e1 (diff)
downloadmpv-3241e6a208ae58c1a0f10b25cd12c0067e94ce2c.tar.bz2
mpv-3241e6a208ae58c1a0f10b25cd12c0067e94ce2c.tar.xz
Do not try to seek beyond the end of the stream when parsing the headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11900 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 9ac01443fc..da7071880a 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1237,7 +1237,8 @@ demux_mkv_read_seekhead (demuxer_t *demuxer)
length -= l + il;
if (seek_id == 0 || seek_id == MATROSKA_ID_CLUSTER
- || seek_pos == EBML_UINT_INVALID)
+ || seek_pos == EBML_UINT_INVALID ||
+ ((mkv_d->segment_start + seek_pos) >= (uint64_t)demuxer->movi_end))
continue;
saved_pos = stream_tell (s);