summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-12-12 16:50:13 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-12-16 06:22:19 +0200
commit21367beef13fadd296edd97ba86240431492f409 (patch)
treecea7d741173065ba621537b7cc39a8ce135719ba
parent7e24b8edb42fd8dc39b273772642a4d23866552f (diff)
downloadmpv-21367beef13fadd296edd97ba86240431492f409.tar.bz2
mpv-21367beef13fadd296edd97ba86240431492f409.tar.xz
demux_mov: fix possible hang on invalid input
len < 8 is also invalid for 64-bit codec chunk size. Previous code could cause hang. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32708 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 92fb9ac322..3175ae34bd 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -367,7 +367,7 @@ static int mov_check_file(demuxer_t* demuxer){
goto skip_chunk;
}
#endif
- else if(len<8) break; // invalid chunk
+ if(len<8) break; // invalid chunk
switch(id){
case MOV_FOURCC('f','t','y','p'): {