eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 04:20:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mov: Check for EOF in mov_read_meta()

Browse Source 
Fixes: Timeout (195sec -> 2ms)
Fixes: 16735/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5090676403863552

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 093d1f4250)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-08-31 01:25:03 +02:00
parent c888b34b1c
commit b1f0a2bdef
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@@ -4063,7 +4063,10 @@ static int mov_read_custom(MOVContext *c, AVIOContext *pb, MOVAtom atom)
static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_meta(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
while (atom.size > 8) { while (atom.size > 8) {
uint32_t tag = avio_rl32(pb); uint32_t tag;
if (avio_feof(pb))
return AVERROR_EOF;
tag = avio_rl32(pb);
atom.size -= 4; atom.size -= 4;
if (tag == MKTAG('h','d','l','r')) { if (tag == MKTAG('h','d','l','r')) {
avio_seek(pb, -8, SEEK_CUR); avio_seek(pb, -8, SEEK_CUR);