diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 16:00:01 +0100 |
| commit | 79ceaf827be0b070675d4cd0a55c3386542defd8 (patch) | |
| tree | c3d245a52930adf0588fe92cc35768643924882b | |
| parent | 8b8cb30d11885b406ce0dd896b42992386d98594 (diff) | |
| download | ffmpeg-79ceaf827be0b070675d4cd0a55c3386542defd8.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>
| -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 ee6a2baf9d..f80a3fe9d7 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -524,6 +524,12 @@ static int decode_ihdr_chunk(AVCodecContext *avctx, PNGDecContext *s, { if (length != 13) return AVERROR_INVALIDDATA; + + if (s->state & PNG_IDAT) { + av_log(avctx, AV_LOG_ERROR, "IHDR after IDAT\n"); + return AVERROR_INVALIDDATA; + } + s->width = bytestream2_get_be32(&s->gb); s->height = bytestream2_get_be32(&s->gb); if (av_image_check_size(s->width, s->height, 0, avctx)) { |