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

avformat/wtvdec: Check size in SBE2_STREAM_DESC_EVENT / stream2_guid 

Fixes: signed integer overflow: 539033600 - -1910497124 cannot be represented in type 'int'
Fixes: 30928/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-5922630966312960

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-03-04 00:30:45 +01:00
parent 6dc6e1cce0
commit 1f74661543
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/wtvdec.c
View File

@ -817,6 +817,8 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
avio_skip(pb, 12); avio_skip(pb, 12);
ff_get_guid(pb, &formattype); ff_get_guid(pb, &formattype);
size = avio_rl32(pb); size = avio_rl32(pb);
if (size < 0 || size > INT_MAX - 92)
return AVERROR_INVALIDDATA;
parse_media_type(s, 0, sid, mediatype, subtype, formattype, size); parse_media_type(s, 0, sid, mediatype, subtype, formattype, size);
consumed += 92 + size; consumed += 92 + size;
} }
@ -831,6 +833,8 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
avio_skip(pb, 12); avio_skip(pb, 12);
ff_get_guid(pb, &formattype); ff_get_guid(pb, &formattype);
size = avio_rl32(pb); size = avio_rl32(pb);
if (size < 0 || size > INT_MAX - 76)
return AVERROR_INVALIDDATA;
parse_media_type(s, s->streams[stream_index], sid, mediatype, subtype, formattype, size); parse_media_type(s, s->streams[stream_index], sid, mediatype, subtype, formattype, size);
consumed += 76 + size; consumed += 76 + size;
} }