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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-10-05 18:39:05 +02:00
parent 1a0c584abc
commit 926221ef84

View file

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