diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:35 +0100 |
| commit | 33d74e62c25a1d706ef13b9471cd139d0e0d6541 (patch) | |
| tree | e1abc35fc28f41223328ad7a23207b1de7ed2676 | |
| parent | 2fcfcd5c8787fd05bbf80d97543caa7713afc927 (diff) | |
| download | ffmpeg-33d74e62c25a1d706ef13b9471cd139d0e0d6541.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 b911c32540..0809d713f1 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -567,6 +567,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)){ |