[FFmpeg-devel] [PATCH 5/7] avcodec/anm: Check input size for a frame with just a stop code

[Peter Ross]

On Thu, Aug 15, 2019 at 11:49:13PM +0200, Michael Niedermayer wrote:
> Fixes: Timeout (11sec -> 6sec)
> Fixes: 16344/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ANM_fuzzer-5673032000995328
> 
> 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/anm.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/libavcodec/anm.c b/libavcodec/anm.c
> index ab6a3994e9..778f38413e 100644
> --- a/libavcodec/anm.c
> +++ b/libavcodec/anm.c
> @@ -119,6 +119,9 @@ static int decode_frame(AVCodecContext *avctx,
>      uint8_t *dst, *dst_end;
>      int count, ret;
>  
> +    if (buf_size < 7)
> +        return AVERROR_INVALIDDATA;
> +
>      if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
>          return ret;
>      dst     = s->frame->data[0];

approve.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190816/cb10c6fe/attachment.sig>