diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 15:45:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 00:26:19 +0100 |
| commit | d723f92dbf6778a17a9e69c56386d357d75d3245 (patch) | |
| tree | a3fe7ee3f67ecc69036158af5ba7c515bf82336d /libavcodec/pngdec.c | |
| parent | 11e5106c56a0f81759b9284369081f922364582a (diff) | |
| download | ffmpeg-d723f92dbf6778a17a9e69c56386d357d75d3245.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
Diffstat (limited to '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 fc7d694ccf..8c9ae92e6f 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -563,6 +563,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)) { |