[FFmpeg-devel] [PATCH 2/6] avcodec/apedec: Check error flag after entropy_decode*

Michael Niedermayer michael at niedermayer.cc
Sun Oct 6 00:41:03 EEST 2019


Fixes: 17886/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5728165124636672

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



More information about the ffmpeg-devel mailing list