RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/wtvdec: Check for EOF before seeking back in parse_media_type() 

Fixes: Infinite loop
Fixes: 36311/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-4889181296918528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 89505d38de)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-08-01 20:42:53 +02:00
parent 1f1318971e
commit ab78ddd4c1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/wtvdec.c
View File

@ -661,6 +661,8 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
avio_skip(pb, size - 32); avio_skip(pb, size - 32);
ff_get_guid(pb, &actual_subtype); ff_get_guid(pb, &actual_subtype);
ff_get_guid(pb, &actual_formattype); ff_get_guid(pb, &actual_formattype);
if (avio_feof(pb))
return NULL;
avio_seek(pb, -size, SEEK_CUR); avio_seek(pb, -size, SEEK_CUR);
st = parse_media_type(s, st, sid, mediatype, actual_subtype, actual_formattype, size - 32); st = parse_media_type(s, st, sid, mediatype, actual_subtype, actual_formattype, size - 32);