Mercurial > libavcodec.hg
changeset 12494:94eaea836bf4 libavcodec
Check avctx width/height more thoroughly (e.g. all values 0 except width would
have been accepted before).
Also do not fail if they are invalid but instead override them to 0.
This allows decoding e.g. MPEG video when only the container values are corrupted.
For encoding a value of 0,0 of course makes no sense, but was allowed
through before and will be caught by an extra check in the encode function.
| author | reimar |
|---|---|
| date | Wed, 15 Sep 2010 04:46:55 +0000 |
| parents | 8e7fd2d2193f |
| children | fac8063ed1e7 |
| files | utils.c |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/utils.c Tue Sep 14 17:11:51 2010 +0000 +++ b/utils.c Wed Sep 15 04:46:55 2010 +0000 @@ -485,10 +485,15 @@ else if(avctx->width && avctx->height) avcodec_set_dimensions(avctx, avctx->width, avctx->height); + if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height) + && ( av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0 + || av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0)) { + av_log(avctx, AV_LOG_WARNING, "ignoring invalid width/height values\n"); + avcodec_set_dimensions(avctx, 0, 0); + } + #define SANE_NB_CHANNELS 128U - if (((avctx->coded_width || avctx->coded_height) - && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) - || avctx->channels > SANE_NB_CHANNELS) { + if (avctx->channels > SANE_NB_CHANNELS) { ret = AVERROR(EINVAL); goto free_and_end; }