[FFmpeg-cvslog] avcodec/apedec: Set error on error in ape_decode_value_3860()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Nov 18 08:51:20 2019 +0100| [2c2ee67fd36edaac88914e9d75e00f16a9a7cc17] | committer: Michael Niedermayer

avcodec/apedec: Set error on error in ape_decode_value_3860()

Fixes: Timeout (unknown -> 15sec)
Fixes: 18808/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5677586072207360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/apedec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index f87131ab4f..1b23e54153 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -496,6 +496,7 @@ static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,
         x = (overflow << rice->k) + get_bits(gb, rice->k);
     } else {
         av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %"PRIu32"\n", rice->k);
+        ctx->error = 1;
         return AVERROR_INVALIDDATA;
     }
     rice->ksum += x - (rice->ksum + 8 >> 4);