[FFmpeg-cvslog] avcodec/indeo4: Check remaining data in Pic hdr extension parsing code

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Thu Jun  8 13:58:47 2017 +0200| [f4dae487906aee87897938d79e998060b5a6583d] | committer: Michael Niedermayer

avcodec/indeo4: Check remaining data in Pic hdr extension parsing code

Fixes: Timeout
Fixes: 2115/clusterfuzz-testcase-minimized-6594111748440064

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

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

 libavcodec/indeo4.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 0065b52c75..1bf402551b 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -246,6 +246,8 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
     /* skip picture header extension if any */
     while (get_bits1(&ctx->gb)) {
         ff_dlog(avctx, "Pic hdr extension encountered!\n");
+        if (get_bits_left(&ctx->gb) < 10)
+            return AVERROR_INVALIDDATA;
         skip_bits(&ctx->gb, 8);
     }