summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2020-11-10 23:01:12 +0100
committerMichael Niedermayer <[email protected]>2021-09-09 13:53:29 +0200
commit67dff50ad857c8b888e311cc6ca7f1e95a350be3 (patch)
tree704ef0e37eb0f883aa83770707040e2053b11d34
parent4db70e21390abadc6087ebad7b1ff80a06209af8 (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 413ae54748..82cfa22881 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 */