har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rawdec: check avpicture_get_size() return value

Browse Source 
Fixes CID205019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-30 04:35:38 +01:00
parent d3de3a16d1
commit 60e957476e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/rawdec.c
View File

@ -113,11 +113,15 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
avctx->pix_fmt==AV_PIX_FMT_PAL8 && avctx->pix_fmt==AV_PIX_FMT_PAL8 &&
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){
context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height);
if (context->length < 0)
return context->length;
context->buffer = av_malloc(context->length); context->buffer = av_malloc(context->length);
if (!context->buffer) if (!context->buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else { } else {
context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
if (context->length < 0)
return context->length;
} }
context->pic.pict_type = AV_PICTURE_TYPE_I; context->pic.pict_type = AV_PICTURE_TYPE_I;
context->pic.key_frame = 1; context->pic.key_frame = 1;