Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-25 20:54:19 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2021-06-18 19:58:25 +0300
commita1a277926b49dad60d9e78c6c7a8c6b5d0d6d7c9 (patch)
tree7431cfea5ebee1faa8f858e8774876c01c2f49b6 /libavformat/msf.c
parente7a990164f67108e99ec5adb8b2d636cd4147715 (diff)
avformat/msf: Check that channels doesnt overflow during extradata construction
Fixes: signed integer overflow: 2048 * 1122336 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_MSF_fuzzer-6726959600107520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/msf.c')
-rw-r--r--libavformat/msf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/msf.c b/libavformat/msf.c
index 43a7f7b616..7d8add387c 100644
--- a/libavformat/msf.c
+++ b/libavformat/msf.c
@@ -70,6 +70,8 @@ static int msf_read_header(AVFormatContext *s)
case 4:
case 5:
case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->channels;
+ if (st->codecpar->channels > UINT16_MAX / 2048)
+ return AVERROR_INVALIDDATA;
ret = ff_alloc_extradata(st->codecpar, 14);
if (ret < 0)
return ret;