ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Oct 5 18:39:05 2019 +0200| [926221ef84ec30cc2b497e12f582d758130e09c5] | committer: Michael Niedermayer
avcodec/apedec: Check error flag after entropy_decode* Fixes: 17886/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5728165124636672 Fixes: 18131/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5710803432374272 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=926221ef84ec30cc2b497e12f582d758130e09c5 --- libavcodec/apedec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 3e2fffb850..9713735574 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1364,6 +1364,8 @@ static void ape_unpack_mono(APEContext *ctx, int count) } ctx->entropy_decode_mono(ctx, count); + if (ctx->error) + return; /* Now apply the predictor decoding */ ctx->predictor_decode_mono(ctx, count); @@ -1387,6 +1389,8 @@ static void ape_unpack_stereo(APEContext *ctx, int count) } ctx->entropy_decode_stereo(ctx, count); + if (ctx->error) + return; /* Now apply the predictor decoding */ ctx->predictor_decode_stereo(ctx, count); _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
