From 45ed942e7e166b288b6f1c262292df6a47295f6a Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 23 Feb 2017 19:45:12 +0100 Subject: [PATCH] avcodec/scpr: improve check for out of range motion vectors Signed-off-by: Paul B Mahol --- libavcodec/scpr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 319057c909..5555d812e8 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -504,7 +504,8 @@ static int decompress_p(AVCodecContext *avctx, mvx -= 256; mvy -= 256; - if (by + mvy + sy1 < 0 || bx + mvx + sx1 < 0) + if (by + mvy + sy1 < 0 || bx + mvx + sx1 < 0 || + by + mvy + sy1 >= avctx->height || bx + mvx + sx1 >= avctx->width) return AVERROR_INVALIDDATA; for (i = 0; i < sy2 - sy1 && (by + sy1 + i) < avctx->height; i++) {