From 8088d6f5f11b9f9188555f4642c940ddc92271a6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 3 Sep 2013 21:45:25 +0200 Subject: [PATCH] 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 --- libavcodec/pictordec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index df3380ddda..a6ecd99d62 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -140,9 +140,9 @@ static int decode_frame(AVCodecContext *avctx, 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 (av_image_check_size(s->width, s->height, 0, avctx) < 0) - return -1; avcodec_set_dimensions(avctx, s->width, s->height); }