| Message ID | 20191028180146.30966-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | f17ea0200178a4dae446a6bec2f68312f41714a0 |
| Headers | show |
probably ok On 10/28/19, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: Timeout (15sec -> 0.4sec) > Fixes: > 18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/apedec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c > index 75c6a96437..2dd197a7f2 100644 > --- a/libavcodec/apedec.c > +++ b/libavcodec/apedec.c > @@ -1516,7 +1516,7 @@ static int ape_decode_frame(AVCodecContext *avctx, > void *data, > av_fast_malloc(&s->decoded_buffer, &s->decoded_size, > decoded_buffer_size); > if (!s->decoded_buffer) > return AVERROR(ENOMEM); > - memset(s->decoded_buffer, 0, s->decoded_size); > + memset(s->decoded_buffer, 0, decoded_buffer_size); > s->decoded[0] = s->decoded_buffer; > s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8); > > -- > 2.23.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Mon, Oct 28, 2019 at 07:22:31PM +0100, Paul B Mahol wrote:
> probably ok
will apply
thx
[...]
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 75c6a96437..2dd197a7f2 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1516,7 +1516,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, av_fast_malloc(&s->decoded_buffer, &s->decoded_size, decoded_buffer_size); if (!s->decoded_buffer) return AVERROR(ENOMEM); - memset(s->decoded_buffer, 0, s->decoded_size); + memset(s->decoded_buffer, 0, decoded_buffer_size); s->decoded[0] = s->decoded_buffer; s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8);
Fixes: Timeout (15sec -> 0.4sec) Fixes: 18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)