diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 19:08:30 +0100 |
| commit | d7470271c7ca3f412aac6b29fb4b8f22ad5c0238 (patch) | |
| tree | cec7d69362e12f2286edc25adbfff3fed7e04c32 | |
| parent | d41010b895755384e22fd918487e0c11dbc02f8e (diff) | |
| download | ffmpeg-d7470271c7ca3f412aac6b29fb4b8f22ad5c0238.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 d4f633ac70..a57deceaaa 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -565,6 +565,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 = bytestream2_get_be32(&s->gb); s->height = bytestream2_get_be32(&s->gb); if (av_image_check_size(s->width, s->height, 0, avctx)) { |