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

Reject video with non multiple of 16 width/height in the 4xm decoder.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit db5b487551)
This commit is contained in:
Laurent Aimar
2011-10-01 02:04:45 +02:00
committed by Michael Niedermayer
parent 55a070870f
commit 6b998720b2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/4xm.c
View File

@@ -885,6 +885,10 @@ static av_cold int decode_init(AVCodecContext *avctx){
av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n"); av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n");
return 1; return 1;
} }
if((avctx->width % 16) || (avctx->height % 16)) {
av_log(avctx, AV_LOG_ERROR, "unsupported width/height\n");
return AVERROR_INVALIDDATA;
}
avcodec_get_frame_defaults(&f->current_picture); avcodec_get_frame_defaults(&f->current_picture);
avcodec_get_frame_defaults(&f->last_picture); avcodec_get_frame_defaults(&f->last_picture);