| Message ID | 20190815214915.909-5-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 1965161ef6d2aac8d3b034570c3da69dabca9e71 |
| Headers | show |
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@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)
On Fri, Aug 16, 2019 at 10:20:42PM +1000, Peter Ross wrote: > 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@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. will apply thx [...]
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];
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@niedermayer.cc> --- libavcodec/anm.c | 3 +++ 1 file changed, 3 insertions(+)