[FFmpeg-devel] [PATCH] avcodec/jvdec: Check available input space before decode8x8()

[Paul B Mahol]

On 2/21/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: Timeout (78 sec -> 15 millisec)
> Fixes:
> 13147/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JV_fuzzer-5727107827630080
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/jvdec.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
> index cbe83d3c10..bf8a55cbad 100644
> --- a/libavcodec/jvdec.c
> +++ b/libavcodec/jvdec.c
> @@ -170,6 +170,11 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
>              GetBitContext gb;
>              init_get_bits(&gb, buf, 8 * video_size);
>
> +            if ( avctx->height/8 * (avctx->width/8) > 4 * video_size) {
> +                av_log(avctx, AV_LOG_ERROR, "Insuffient input data for
> dimensions\n");

Typo

> +                return AVERROR_INVALIDDATA;
> +            }
> +
>              for (j = 0; j < avctx->height; j += 8)
>                  for (i = 0; i < avctx->width; i += 8)
>                      decode8x8(&gb,
> --
> 2.20.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>