]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/utils: Check for integer overflow in get_audio_frame_duration() for ADPCM_DTK
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 3 Nov 2020 18:21:18 +0000 (19:21 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 23 Jan 2021 00:05:25 +0000 (01:05 +0100)
Fixes: signed integer overflow: 131203586 * 28 cannot be represented in type 'int'
Fixes: 26817/clusterfuzz-testcase-minimized-ffmpeg_dem_MSF_fuzzer-6296902548848640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/utils.c

index b2313860d043e6bd87f3a869415425c2d954c33f..aeb9c6de7285d201062a62390f298d5cb363d718 100644 (file)
@@ -1710,7 +1710,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
                 return frame_bytes / (9 * ch) * 16;
             case AV_CODEC_ID_ADPCM_PSX:
             case AV_CODEC_ID_ADPCM_DTK:
-                return frame_bytes / (16 * ch) * 28;
+                frame_bytes /= 16 * ch;
+                if (frame_bytes > INT_MAX / 28)
+                    return 0;
+                return frame_bytes * 28;
             case AV_CODEC_ID_ADPCM_4XM:
             case AV_CODEC_ID_ADPCM_IMA_DAT4:
             case AV_CODEC_ID_ADPCM_IMA_ISS: