mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-24 15:57:00 +00:00
avcodec/utils: Check ima wav duration for overflow
Fixes: signed integer overflow: 44331634 * 65 cannot be represented in type 'int'
Fixes: 32120/clusterfuzz-testcase-minimized-ffmpeg_dem_RSD_fuzzer-5760221223583744
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 f40e9b1355
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
05954971ba
commit
dcdb7d2dab
@ -1700,11 +1700,15 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
|
|||||||
if (ba > 0) {
|
if (ba > 0) {
|
||||||
/* calc from frame_bytes, channels, and block_align */
|
/* calc from frame_bytes, channels, and block_align */
|
||||||
int blocks = frame_bytes / ba;
|
int blocks = frame_bytes / ba;
|
||||||
|
int64_t tmp;
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case AV_CODEC_ID_ADPCM_IMA_WAV:
|
case AV_CODEC_ID_ADPCM_IMA_WAV:
|
||||||
if (bps < 2 || bps > 5)
|
if (bps < 2 || bps > 5)
|
||||||
return 0;
|
return 0;
|
||||||
return blocks * (1 + (ba - 4 * ch) / (bps * ch) * 8);
|
tmp = blocks * (1LL + (ba - 4 * ch) / (bps * ch) * 8);
|
||||||
|
if (tmp != (int)tmp)
|
||||||
|
return 0;
|
||||||
|
return tmp;
|
||||||
case AV_CODEC_ID_ADPCM_IMA_DK3:
|
case AV_CODEC_ID_ADPCM_IMA_DK3:
|
||||||
return blocks * (((ba - 16) * 2 / 3 * 4) / ch);
|
return blocks * (((ba - 16) * 2 / 3 * 4) / ch);
|
||||||
case AV_CODEC_ID_ADPCM_IMA_DK4:
|
case AV_CODEC_ID_ADPCM_IMA_DK4:
|
||||||
|
Loading…
Reference in New Issue
Block a user