[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.6,1.7

Moritz Bunkus CVS mosu at mplayerhq.hu
Sat Jan 31 10:54:11 CET 2004


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv15075

Modified Files:
	demux_mkv.c 
Log Message:
Do not try to seek beyond the end of the stream when parsing the headers.

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demux_mkv.c	27 Jan 2004 06:02:29 -0000	1.6
+++ demux_mkv.c	31 Jan 2004 09:54:09 -0000	1.7
@@ -1237,7 +1237,8 @@
       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);




More information about the MPlayer-cvslog mailing list