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

motionpixels: check extradata size

Browse Source 
Fixes null ptr derefernce
Fixes Ticket1363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50122084a6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-05-28 17:17:49 +02:00
parent 59417897be
commit c254214ea3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/motionpixels.c
View File

@@ -55,6 +55,11 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
int w4 = (avctx->width + 3) & ~3; int w4 = (avctx->width + 3) & ~3;
int h4 = (avctx->height + 3) & ~3; int h4 = (avctx->height + 3) & ~3;
if(avctx->extradata_size < 2){
av_log(avctx, AV_LOG_ERROR, "extradata too small\n");
return AVERROR_INVALIDDATA;
}
motionpixels_tableinit(); motionpixels_tableinit();
mp->avctx = avctx; mp->avctx = avctx;
ff_dsputil_init(&mp->dsp, avctx); ff_dsputil_init(&mp->dsp, avctx);