diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-09-10 18:52:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-05 21:28:08 +0200 |
| commit | 8af33f41f7aad5dcc9633c4290dbaa4d016fe90a (patch) | |
| tree | 5feb7681b55b671354946f3ccce5c80e776f296a | |
| parent | c8fb3183a4f1b15e3623955affba4a1c70b01efd (diff) | |
| download | ffmpeg-8af33f41f7aad5dcc9633c4290dbaa4d016fe90a.tar.gz | |
avcodec/agm: Fix off by 1 error in decode_inter_plane()
Fixes: Regression since 1f2096945709a32315da740691b5716da55893c3
Found-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6d71a25cc460960c49997d52c1d1f1c39ccc38b4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/agm.c | 4 |
1 files 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, |