diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-02 08:35:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:57 +0100 |
| commit | 1f88bbc9f2c74f39d8e3ba86ed01cae896dd474c (patch) | |
| tree | 13c7dbfebcfe0eff363e591579a123115cab2d9c | |
| parent | d6cc432751cd1e8b693d4beb05cce6d8baf936c1 (diff) | |
| download | ffmpeg-1f88bbc9f2c74f39d8e3ba86ed01cae896dd474c.tar.gz | |
avcodec/agm: Do not allow MVs out of the picture area as no edge is allocated
Fixes: out of array access
Fixes: 18499/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5749038406434816
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7a1b30c871c873e97c93af75f925c854de7b75f2)
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 89f85f03c6..628f324913 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -460,8 +460,8 @@ static int decode_inter_plane(AGMContext *s, GetBitContext *gb, int size, return ret; if (orig_mv_x >= -32) { - if (y * 8 + mv_y < 0 || y * 8 + mv_y >= h || - x * 8 + mv_x < 0 || x * 8 + mv_x >= 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, |