[FFmpeg-devel] [PATCH 4/4] avcodec/hqx: Check the input data against the image size

[Paul B Mahol]

On 7/21/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: Timeout (22 -> 7 sec)
> Fixes:
> 15173/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQX_fuzzer-5662556846292992
>
> 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/hqx.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
> index bc24ba91d1..8639d77a41 100644
> --- a/libavcodec/hqx.c
> +++ b/libavcodec/hqx.c
> @@ -471,6 +471,10 @@ static int hqx_decode_frame(AVCodecContext *avctx, void
> *data,
>      avctx->height              = ctx->height;
>      avctx->bits_per_raw_sample = 10;
>
> +    if (avctx->coded_width / 16 * (avctx->coded_height / 16) *
> +        (100 - avctx->discard_damaged_percentage) / 100 > 8LL *
> avpkt->size)
> +        return AVERROR_INVALIDDATA;

Why just this change and not something better?

> +
>      switch (ctx->format) {
>      case HQX_422:
>          avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
> --
> 2.22.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".