aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-01 18:53:52 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-01 18:54:41 +0200
commitb29feec9829cfab2523c8d95e35bd69e689ea4af (patch)
tree995fdbe3872169dae7595bfac1feb52e114e312a
parent2f00300b779e7b247c85db0d7daef448225105ff (diff)
downloadffmpeg-b29feec9829cfab2523c8d95e35bd69e689ea4af.tar.gz
avcodec/indeo2: Check remaining bits in ir2_decode_plane()
Fixes: 1290/clusterfuzz-testcase-minimized-5815578902134784 Fixes: timeout Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/indeo2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index c89845233e..f1324e4635 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -77,6 +77,8 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst
for (j = 1; j < height; j++) {
out = 0;
+ if (get_bits_left(&ctx->gb) <= 0)
+ return AVERROR_INVALIDDATA;
while (out < width) {
int c = ir2_get_code(&ctx->gb);
if (c >= 0x80) { /* we have a skip */
@@ -116,6 +118,8 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_
for (j = 0; j < height; j++) {
out = 0;
+ if (get_bits_left(&ctx->gb) <= 0)
+ return AVERROR_INVALIDDATA;
while (out < width) {
c = ir2_get_code(&ctx->gb);
if (c >= 0x80) { /* we have a skip */