virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avformat/genh: Check block_align for how it will be used in SDX2_DPCM

Browse Source 
Fixes: signed integer overflow: 19922944 * 1024 cannot be represented in type 'int'
Fixes: 26402/clusterfuzz-testcase-minimized-ffmpeg_dem_VMD_fuzzer-5745470053548032

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 c95b47e18f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-10-17 23:40:57 +02:00
parent 5be63051e7
commit cb961b2322
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/genh.c
View File

@ -87,7 +87,9 @@ static int genh_read_header(AVFormatContext *s)
case 5: st->codecpar->codec_id = st->codecpar->block_align > 0 ? case 5: st->codecpar->codec_id = st->codecpar->block_align > 0 ?
AV_CODEC_ID_PCM_S8_PLANAR : AV_CODEC_ID_PCM_S8_PLANAR :
AV_CODEC_ID_PCM_S8; break; AV_CODEC_ID_PCM_S8; break;
case 6: st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM; break; case 6: if (st->codecpar->block_align > INT_MAX/1024)
return AVERROR_INVALIDDATA;
st->codecpar->codec_id = AV_CODEC_ID_SDX2_DPCM; break;
case 7: ret = ff_alloc_extradata(st->codecpar, 2); case 7: ret = ff_alloc_extradata(st->codecpar, 2);
if (ret < 0) if (ret < 0)
return ret; return ret;