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-01-02 02:58:42 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2021-01-23 16:32:54 +0300
commitb17ffe8f8f30ba03901bcf7caa6c523e874e8fde (patch)
tree07a7b0fb9b98b70baf21341697c59a97b05e1487 /libavformat/iff.c
parentd8a585d4d5c0589b419ccacaa9bbfbb7c79126f0 (diff)
avformat/iff: Check block align also for ID_MAUD
Fixes: Timeout & OOM Fixes: 28701/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-5185094964871168 Fixes: 29116/clusterfuzz-testcase-minimized-ffmpeg_dem_IFF_fuzzer-4874284795297792 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/iff.c')
-rw-r--r--libavformat/iff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 2dba121f6f..b07b6c8b18 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -763,7 +763,7 @@ static int iff_read_header(AVFormatContext *s)
st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id);
st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample;
st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample;
- if (st->codecpar->codec_tag == ID_DSD && st->codecpar->block_align <= 0)
+ if ((st->codecpar->codec_tag == ID_DSD || st->codecpar->codec_tag == ID_MAUD) && st->codecpar->block_align <= 0)
return AVERROR_INVALIDDATA;
break;