From 8af33f41f7aad5dcc9633c4290dbaa4d016fe90a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 10 Sep 2020 18:52:48 +0200 Subject: [PATCH] avcodec/agm: Fix off by 1 error in decode_inter_plane() Fixes: Regression since 1f2096945709a32315da740691b5716da55893c3 Found-by: Paul B Mahol Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer (cherry picked from commit 6d71a25cc460960c49997d52c1d1f1c39ccc38b4) Signed-off-by: Michael Niedermayer --- libavcodec/agm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/agm.c b/libavcodec/agm.c index bc9dfc02f3..5b7282b81f 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -423,8 +423,8 @@ static int decode_inter_plane(AGMContext *s, GetBitContext *gb, int size, int map = s->map[x]; if (orig_mv_x >= -32) { - if (y * 8 + mv_y < 0 || y * 8 + mv_y + 8 >= h || - x * 8 + mv_x < 0 || x * 8 + mv_x + 8 >= w) + if (y * 8 + mv_y < 0 || y * 8 + mv_y + 8 > h || + x * 8 + mv_x < 0 || x * 8 + mv_x + 8 > w) return AVERROR_INVALIDDATA; copy_block8(frame->data[plane] + (s->blocks_h - 1 - y) * 8 * frame->linesize[plane] + x * 8,