Browse Source

avcodec/huffyuvdec: Test vertical coordinate more often

Fixes: out of array access
Fixes: 22892/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HYMT_fuzzer-5135996772679680.fuzz

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>
tags/n4.3
Michael Niedermayer 4 years ago
parent
commit
a1223ddc56
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      libavcodec/huffyuvdec.c

+ 8
- 0
libavcodec/huffyuvdec.c View File

@@ -928,12 +928,16 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height,
left= left_prediction(s, p->data[plane], s->temp[0], w, 0);

y = 1;
if (y >= h)
break;

/* second line is left predicted for interlaced case */
if (s->interlaced) {
decode_plane_bitstream(s, w, plane);
left = left_prediction(s, p->data[plane] + p->linesize[plane], s->temp[0], w, left);
y++;
if (y >= h)
break;
}

lefttop = p->data[plane][0];
@@ -1045,6 +1049,8 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height,
}

cy = y = 1;
if (y >= height)
break;

/* second line is left predicted for interlaced case */
if (s->interlaced) {
@@ -1057,6 +1063,8 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height,
}
y++;
cy++;
if (y >= height)
break;
}

/* next 4 pixels are left predicted too */


Loading…
Cancel
Save