diff options
| -rw-r--r-- | libavcodec/utils.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e12b677a93..543c1bdab5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -485,10 +485,15 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) 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; } |