aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-03-03 10:49:04 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-09 22:02:20 +0200
commit5310bf2493fe15b25748711d63df906cf2e4ba7b (patch)
tree36391e346ee683458c475cc99e86ccb7f4f5ce42
parentbe7d80bc43cccdf941894623542075445c3960bb (diff)
downloadffmpeg-5310bf2493fe15b25748711d63df906cf2e4ba7b.tar.gz
avformat/aiffdec: Check that SSND is at least 8 bytes
Fixes: Infinite loop Fixes: 30874/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-5933710488764416 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 460d3dc41f57a6dcefbd72db6e2e368fee05340b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/aiffdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 6905f30ae0..004d27a712 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -286,6 +286,8 @@ static int aiff_read_header(AVFormatContext *s)
get_meta(s, "comment" , size);
break;
case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */
+ if (size < 8)
+ return AVERROR_INVALIDDATA;
aiff->data_end = avio_tell(pb) + size;
offset = avio_rb32(pb); /* Offset of sound data */
avio_rb32(pb); /* BlockSize... don't care */