virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

indeo5: check motion vectors.

Browse Source 
fixes out of frame reading

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-26 02:24:36 +02:00
parent 33f39c02aa
commit c855ece101
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/indeo5.c
View File

@ -450,7 +450,7 @@ static int decode_mb_info(IVI5DecContext *ctx, IVIBandDesc *band,
IVITile *tile, AVCodecContext *avctx) IVITile *tile, AVCodecContext *avctx)
{ {
int x, y, mv_x, mv_y, mv_delta, offs, mb_offset, int x, y, mv_x, mv_y, mv_delta, offs, mb_offset,
mv_scale, blks_per_mb; mv_scale, blks_per_mb, s;
IVIMbInfo *mb, *ref_mb; IVIMbInfo *mb, *ref_mb;
int row_offset = band->mb_size * band->pitch; int row_offset = band->mb_size * band->pitch;
@ -550,6 +550,15 @@ static int decode_mb_info(IVI5DecContext *ctx, IVIBandDesc *band,
} }
} }
s= band->is_halfpel;
if (mb->type)
if ( x + (mb->mv_x >>s) + (y+ (mb->mv_y >>s))*band->pitch < 0 ||
x + ((mb->mv_x+s)>>s) + band->mb_size - 1
+ (y+band->mb_size - 1 +((mb->mv_y+s)>>s))*band->pitch > band->bufsize - 1) {
av_log(avctx, AV_LOG_ERROR, "motion vector %d %d outside reference\n", x*s + mb->mv_x, y*s + mb->mv_y);
return AVERROR_INVALIDDATA;
}
mb++; mb++;
if (ref_mb) if (ref_mb)
ref_mb++; ref_mb++;

1
libavcodec/ivi_common.c
View File

@ -209,6 +209,7 @@ int av_cold ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg)
band->pitch = width_aligned; band->pitch = width_aligned;
band->bufs[0] = av_malloc(buf_size); band->bufs[0] = av_malloc(buf_size);
band->bufs[1] = av_malloc(buf_size); band->bufs[1] = av_malloc(buf_size);
band->bufsize = buf_size/2;
if (!band->bufs[0] || !band->bufs[1]) if (!band->bufs[0] || !band->bufs[1])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);