mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/pictordec: run av_image_check_size() unconditionally
This ensures that no invalid size leaks through (This issue is hypothetical, ive no testcase) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
d21e496cf5
commit
8088d6f5f1
|
@ -140,9 +140,9 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
|
|
||||||
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||||
|
|
||||||
|
if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
|
||||||
|
return -1;
|
||||||
if (s->width != avctx->width && s->height != avctx->height) {
|
if (s->width != avctx->width && s->height != avctx->height) {
|
||||||
if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
|
|
||||||
return -1;
|
|
||||||
avcodec_set_dimensions(avctx, s->width, s->height);
|
avcodec_set_dimensions(avctx, s->width, s->height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue