[FFmpeg-cvslog] avcodec/apedec: Only clear the needed buffer space, instead of all

Michael Niedermayer git at videolan.org
Tue Oct 29 17:23:24 EET 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Oct 27 23:26:52 2019 +0100| [f17ea0200178a4dae446a6bec2f68312f41714a0] | committer: Michael Niedermayer

avcodec/apedec: Only clear the needed buffer space, instead of all

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
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f17ea0200178a4dae446a6bec2f68312f41714a0
---

 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);
 



More information about the ffmpeg-cvslog mailing list