aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/aadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-04-07 12:04:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-21 09:31:08 +0200
commitdaa2482871dffa9af12fa6d874a3d2dedd73f42e (patch)
tree8304423a2e493c2604d184eb7454ab0cb844db4b /libavformat/aadec.c
parent435fa373d1f5045b17de74934e44863e2fb3071f (diff)
downloadffmpeg-daa2482871dffa9af12fa6d874a3d2dedd73f42e.tar.gz
avformat/aadec: Check toc_size to contain the minimum to demuxer uses
Fixes: out of array access Fixes: stack-buffer-overflow-READ-0x0831fff1 Found-by: GalyCannon <galycannon@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/aadec.c')
-rw-r--r--libavformat/aadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aadec.c b/libavformat/aadec.c
index b9dd51ebfc..63f8176a57 100644
--- a/libavformat/aadec.c
+++ b/libavformat/aadec.c
@@ -92,7 +92,7 @@ static int aa_read_header(AVFormatContext *s)
avio_skip(pb, 4); // magic string
toc_size = avio_rb32(pb); // TOC size
avio_skip(pb, 4); // unidentified integer
- if (toc_size > MAX_TOC_ENTRIES)
+ if (toc_size > MAX_TOC_ENTRIES || toc_size < 2)
return AVERROR_INVALIDDATA;
for (i = 0; i < toc_size; i++) { // read TOC
avio_skip(pb, 4); // TOC entry index