summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2020-11-10 23:01:12 +0100
committerMichael Niedermayer <[email protected]>2021-02-02 14:18:21 +0100
commit5eca6df648ba08f2d6d0f1cdcc79be3f1162ef2b (patch)
treef495bf82358ceb8a72b213bb24e4d48f1ed11906
parent19ec9d0dda90819a03bf689165fb72c84fdef1bd (diff)
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 <[email protected]> (cherry picked from commit 8af299acde9601e64740b75430960503615873b4) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavformat/aiffdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 15733478e1..4d1c9bbb53 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 */