diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-10 23:01:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | e537ef1a0d92a2e9d53a4790ae6f56fbb8e438c6 (patch) | |
| tree | e05878e6c43e6dd15e050d7f4cfa18bda1a467ce | |
| parent | a2c10d3b2a6ecb720050dac5bfe0f09245b373c0 (diff) | |
| download | ffmpeg-e537ef1a0d92a2e9d53a4790ae6f56fbb8e438c6.tar.gz | |
avformat/aiffdec: Check size before subtraction in get_aiff_header()
Fixes: Infinite loop
Fixes: 27235/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-5761398380167168
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 8af299acde9601e64740b75430960503615873b4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/aiffdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 925486c021..6905f30ae0 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -120,6 +120,8 @@ static int get_aiff_header(AVFormatContext *s, int size, else sample_rate = (val + (1ULL<<(-exp-1))) >> -exp; par->sample_rate = sample_rate; + if (size < 18) + return AVERROR_INVALIDDATA; size -= 18; /* get codec id for AIFF-C */ |