Merge commit 'd7f4f5c4a18a0c9e62635cfa6fe8a9302b413c01'

[ffmpeg] / libavcodec / dfa.c

diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index 536040d65c9b8aae2db593724520b45100eff0cc..970175fb734680e6812145c002f95dd54e068623 100644 (file)
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -41,7 +41,7 @@ static av_cold int dfa_decode_init(AVCodecContext *avctx)
 
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
 
-    if (!avctx->width || !avctx->height)
+    if (!avctx->width || !avctx->height || FFMAX(avctx->width, avctx->height) >= (1<<16))
         return AVERROR_INVALIDDATA;
 
     av_assert0(av_image_check_size(avctx->width, avctx->height, 0, avctx) >= 0);