Mercurial > libavcodec.hg
diff h264.c @ 6581:e6d8c5bbeeac libavcodec
Avoid crash with idiotic cropping. Fixes crash with CVFC1_Sony_C.jsv
and closes issue333.
author | michael |
---|---|
date | Fri, 11 Apr 2008 12:55:21 +0000 |
parents | 01647ac078a7 |
children | e5967b1cc475 |
line wrap: on
line diff
--- a/h264.c Thu Apr 10 19:09:39 2008 +0000 +++ b/h264.c Fri Apr 11 12:55:21 2008 +0000 @@ -3941,11 +3941,11 @@ h->b_stride= s->mb_width*4; h->b8_stride= s->mb_width*2; - s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); + s->width = 16*s->mb_width - 2*FFMIN(h->sps.crop_right, 7); if(h->sps.frame_mbs_only_flag) - s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); + s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7); else - s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck + s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3); if (s->context_initialized && ( s->width != s->avctx->width || s->height != s->avctx->height)) { @@ -7244,6 +7244,9 @@ if(sps->crop_left || sps->crop_top){ av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); } + if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !h->sps.frame_mbs_only_flag)){ + av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n"); + } }else{ sps->crop_left = sps->crop_right =