]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/utils: Check for overflow with ATRAC* in get_audio_frame_duration()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 16 Oct 2020 11:30:29 +0000 (13:30 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 17 Oct 2020 12:36:11 +0000 (14:36 +0200)
Fixes: signed integer overflow: 1024 * 13129048 cannot be represented in type 'int'
Fixes: 26378/clusterfuzz-testcase-minimized-ffmpeg_dem_CODEC2RAW_fuzzer-5634018353348608
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 a43474d437c6c59f9ecc566bf50f242ee2de518c..93ac1cd9f0c5977e6c7b74b011b823c4f4d7ab7a 100644 (file)
@@ -1614,7 +1614,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
     case AV_CODEC_ID_MP1:          return  384;
     case AV_CODEC_ID_ATRAC1:       return  512;
     case AV_CODEC_ID_ATRAC9:
-    case AV_CODEC_ID_ATRAC3:       return 1024 * framecount;
+    case AV_CODEC_ID_ATRAC3:
+        if (framecount > INT_MAX/1024)
+            return 0;
+        return 1024 * framecount;
     case AV_CODEC_ID_ATRAC3P:      return 2048;
     case AV_CODEC_ID_MP2:
     case AV_CODEC_ID_MUSEPACK7:    return 1152;