diff mbox series

[FFmpeg-devel,4/4] avformat/aiffdec: Check that SSND is at least 8 bytes

Message ID 20210303094904.4221-4-michael@niedermayer.cc
State Accepted
Commit 460d3dc41f57a6dcefbd72db6e2e368fee05340b
Headers show
Series [FFmpeg-devel,1/4] avcodec/jpegls: Check A[Q] for overflow in ff_jpegls_update_state_regular() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer March 3, 2021, 9:49 a.m. UTC 
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/aiffdec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul B Mahol March 3, 2021, 11:16 a.m. UTC | #1 
lgtm
Michael Niedermayer March 3, 2021, 3:33 p.m. UTC | #2 
On Wed, Mar 03, 2021 at 12:16:53PM +0100, Paul B Mahol wrote:
> lgtm

will apply

thanks

[...]
diff mbox series

Patch

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 5abc0c9643..dcaf1560b6 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 */