generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/rawdec: Check the return code of avpicture_get_size()

Browse Source 
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 1d3a3b9f89)

Conflicts:

	libavcodec/rawdec.c
This commit is contained in:
Michael Niedermayer
2014-11-26 18:56:39 +01:00
parent ef8fbb4878
commit 6212758c07
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/rawdec.c
View File

@@ -144,6 +144,9 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width, context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
avctx->height); avctx->height);
} }
if (context->frame_size < 0)
return context->frame_size;
if ((avctx->extradata_size >= 9 && if ((avctx->extradata_size >= 9 &&
!memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) ||