diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:47:05 +0100 |
| commit | cb1db92cca98f963e91f421ee0c84f8866325a73 (patch) | |
| tree | 541f9446cf4bf782e69c42070811b8e508dc06ff | |
| parent | 30e8a375901f8802853fd6d478b77a127d208bd6 (diff) | |
| download | ffmpeg-cb1db92cca98f963e91f421ee0c84f8866325a73.tar.gz | |
avcodec/pngdec: Check IHDR/IDAT order
Fixes out of array access
Fixes: asan_heap-oob_20a6c26_2690_cov_3434532168_mail.png
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 79ceaf827be0b070675d4cd0a55c3386542defd8)
Conflicts:
libavcodec/pngdec.c
| -rw-r--r-- | libavcodec/pngdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 22c50b720e..a8c1d88449 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -418,6 +418,12 @@ static int decode_frame(AVCodecContext *avctx, case MKTAG('I', 'H', 'D', 'R'): if (length != 13) goto fail; + + if (s->state & PNG_IDAT) { + av_log(avctx, AV_LOG_ERROR, "IHDR after IDAT\n"); + goto fail; + } + s->width = bytestream_get_be32(&s->bytestream); s->height = bytestream_get_be32(&s->bytestream); if(av_image_check_size(s->width, s->height, 0, avctx)){ |