From 649c171aec1c36c5975a840e49a90038a3957948 Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Mon, 16 Feb 2009 22:46:30 +0000 Subject: Thoroughly check all fields set by the application in xvmc struct. Originally committed as revision 17387 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo_xvmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavcodec/mpegvideo_xvmc.c') diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 3d56bec374..ade72739cd 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -90,7 +90,11 @@ int ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx) return -1; } if (render->allocated_mv_blocks < 1 || - render->allocated_data_blocks < mb_block_count) { + render->allocated_data_blocks < render->allocated_mv_blocks*mb_block_count || + render->start_mv_blocks_num >= render->allocated_mv_blocks || + render->next_free_data_block_num > + render->allocated_data_blocks - + mb_block_count*(render->allocated_mv_blocks-render->start_mv_blocks_num)) { av_log(avctx, AV_LOG_ERROR, "Rendering surface doesn't provide enough block structures to work with.\n"); return -1; -- cgit v1.2.3