diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-10 23:01:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-10 16:04:26 +0200 |
| commit | 502ca11d692aa1e55c8a7a5b34f4d8fda747e9fd (patch) | |
| tree | ecd7f7ba44b5775c2ba09de718bdbb6b29e1db50 | |
| parent | 6ed98dfd143b9310e0f8bf601279ca537fdece0f (diff) | |
| download | ffmpeg-502ca11d692aa1e55c8a7a5b34f4d8fda747e9fd.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 e96f808dea..ca84a89e6c 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -119,6 +119,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 */ |