diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-04-07 12:04:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-05 12:43:08 +0200 |
| commit | 104e38464bffb9e0a329fd399b08e7e13f79ff6e (patch) | |
| tree | 209b316b090d47fc9f5fca55e88c5d63270e5bb8 | |
| parent | 832ae51f9b4ce1003c2e817900b0332d1df457f7 (diff) | |
| download | ffmpeg-104e38464bffb9e0a329fd399b08e7e13f79ff6e.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>
(cherry picked from commit daa2482871dffa9af12fa6d874a3d2dedd73f42e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/aadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 16c47950e4..654fabbf33 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -85,7 +85,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 |