virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avformat/mvi: Check audio size for more overflows

Browse Source 
Fixes: left shift of negative value -352256000
Fixes: 30837/clusterfuzz-testcase-minimized-ffmpeg_dem_MVI_fuzzer-5755626262888448

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-02-22 20:20:48 +01:00
parent 1c88098651
commit 403b35e16e
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/mvi.c
View File

@ -120,6 +120,10 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
mvi->video_frame_size = (mvi->get_int)(pb); mvi->video_frame_size = (mvi->get_int)(pb);
if (mvi->audio_size_left == 0) if (mvi->audio_size_left == 0)
return AVERROR(EIO); return AVERROR(EIO);
if (mvi->audio_size_counter + 512 > UINT64_MAX - mvi->audio_frame_size ||
mvi->audio_size_counter + 512 + mvi->audio_frame_size >= ((uint64_t)INT32_MAX) << MVI_FRAC_BITS)
return AVERROR_INVALIDDATA;
count = (mvi->audio_size_counter + mvi->audio_frame_size + 512) >> MVI_FRAC_BITS; count = (mvi->audio_size_counter + mvi->audio_frame_size + 512) >> MVI_FRAC_BITS;
if (count > mvi->audio_size_left) if (count > mvi->audio_size_left)
count = mvi->audio_size_left; count = mvi->audio_size_left;