summaryrefslogtreecommitdiff
path: root/libavcodec/rasc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-10-02 03:04:51 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-10-03 11:14:17 +0200
commit9a9034958aec8c30ee898db23cb691863801ea1f (patch)
treeba24a92908b3ddb353a89957769b05ce09c9e657 /libavcodec/rasc.c
parentc905840e8c0a0d4bc3737879bfc038618ecba2b2 (diff)
avcodec/rasc: Fix off by 1 error in vertical coordinate
Fixes: out of array read Fixes: 10311/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RASC_fuzzer-4856330905452544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/rasc.c')
-rw-r--r--libavcodec/rasc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c
index fbbb134f4b..eb021681c6 100644
--- a/libavcodec/rasc.c
+++ b/libavcodec/rasc.c
@@ -272,9 +272,9 @@ static int decode_move(AVCodecContext *avctx,
if (!s->frame2->data[0] || !s->frame1->data[0])
return AVERROR_INVALIDDATA;
- b1 = s->frame1->data[0] + s->frame1->linesize[0] * (start_y + h) + start_x * s->bpp;
- b2 = s->frame2->data[0] + s->frame2->linesize[0] * (start_y + h) + start_x * s->bpp;
- e2 = s->frame2->data[0] + s->frame2->linesize[0] * (mov_y + h) + mov_x * s->bpp;
+ b1 = s->frame1->data[0] + s->frame1->linesize[0] * (start_y + h - 1) + start_x * s->bpp;
+ b2 = s->frame2->data[0] + s->frame2->linesize[0] * (start_y + h - 1) + start_x * s->bpp;
+ e2 = s->frame2->data[0] + s->frame2->linesize[0] * (mov_y + h - 1) + mov_x * s->bpp;
if (type == 2) {
for (int j = 0; j < h; j++) {