diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 18:56:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 19:08:30 +0100 |
| commit | a06432b6c315fda5a9cc69059fd106d231e7da6c (patch) | |
| tree | ca318619c493f7a2bba0ddcb0cf2be802fbb0d56 | |
| parent | d7470271c7ca3f412aac6b29fb4b8f22ad5c0238 (diff) | |
| download | ffmpeg-a06432b6c315fda5a9cc69059fd106d231e7da6c.tar.gz | |
avcodec/rawdec: Check the return code of avpicture_get_size()
Fixes out of array access
Fixes: asan_heap-oob_22388d0_3435_cov_3297128910_small_roll5_FlashCine1.cine
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d3a3b9f8907625b361420d48fe05716859620ff)
Conflicts:
libavcodec/rawdec.c
| -rw-r--r-- | libavcodec/rawdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index d187d23cb5..437363d2bc 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -136,6 +136,9 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); } + if (context->frame_size < 0) + return context->frame_size; + if ((avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || |