aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-08 13:58:47 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-08 17:37:16 +0200
commita3b5b60bdf451faefeeec07c4e684a251968bf2d (patch)
tree0d8fa3820f187fe66445ca2af6ba7b95d676960e
parent4e3ab1a5c12fe3a88f44b734d3f2e25f4769ec47 (diff)
downloadffmpeg-a3b5b60bdf451faefeeec07c4e684a251968bf2d.tar.gz
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@niedermayer.cc>
-rw-r--r--libavcodec/indeo4.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 594c56d163..85d5fa3e7a 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -237,6 +237,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);
}