]> git.sesse.net Git - ffmpeg/commitdiff
avformat/aiffdec: Check size before subtraction in get_aiff_header()
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 10 Nov 2020 22:01:12 +0000 (23:01 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 29 Jan 2021 18:36:46 +0000 (19:36 +0100)
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>
libavformat/aiffdec.c

index 15733478e1426ceb62a725d2899a59143772e188..4d1c9bbb53110fed8185270d7cbc08e0833eb848 100644 (file)
@@ -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 */