aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-04-23 17:28:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-12 11:22:04 +0200
commitf95a80bbd7cbe335fc8e271084571029d5ee26d9 (patch)
tree3b1ce55370699d6537b7df026b3488ef63a061e0
parentc593517453bce7f034417850cbe5dc03c54de466 (diff)
downloadffmpeg-f95a80bbd7cbe335fc8e271084571029d5ee26d9.tar.gz
avformat/aiffdec: Check for size overflow in header parsing
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6723467048255488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bae2e1977744f42d56b85193d4910811de829714) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/aiffdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 7c88327e9c..4a042701e3 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -102,6 +102,9 @@ static int get_aiff_header(AVFormatContext *s, int size,
int sample_rate;
unsigned int num_frames;
+ if (size == INT_MAX)
+ return AVERROR_INVALIDDATA;
+
if (size & 1)
size++;
par->codec_type = AVMEDIA_TYPE_AUDIO;