diff mbox series

[FFmpeg-devel,3/3] avcodec/utils: Check for overflow with ATRAC* in get_audio_frame_duration()

Message ID 20201016113029.25585-3-michael@niedermayer.cc
State Accepted
Commit 01bb12f883dccc419317516e093fdc6dfa41bc31
Headers show
Series [FFmpeg-devel,1/3] avcodec/hevc_mvs: Cleanup ff_hevc_set_neighbour_available() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make warning Make failed

Commit Message

Michael Niedermayer Oct. 16, 2020, 11:30 a.m. UTC 
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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a43474d437..93ac1cd9f0 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -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;