[FFmpeg-cvslog] avcodec/apedec: Check remaining space in decode_array_0000()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Oct  5 18:39:05 2019 +0200| [7b94b22261c216f2eeaaa089e6a003d46f6a3458] | committer: Michael Niedermayer

avcodec/apedec: Check remaining space in decode_array_0000()

Fixes: Timeout (? -> 2sec)
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 at niedermayer.cc>

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

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

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 9713735574..c6754a5ee6 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -609,6 +609,10 @@ static void decode_array_0000(APEContext *ctx, GetBitContext *gb,
     ksummax = 1 << rice->k + 7;
     ksummin = rice->k ? (1 << rice->k + 6) : 0;
     for (; i < blockstodecode; i++) {
+        if (get_bits_left(&ctx->gb) < 1) {
+            ctx->error = 1;
+            return ;
+        }
         out[i] = get_rice_ook(&ctx->gb, rice->k);
         rice->ksum += out[i] - out[i - 64];
         while (rice->ksum < ksummin) {