aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-04-13 00:15:27 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-04-19 21:06:09 +0200
commitbcf9d2a17242b78dc4cd56731893c9a5781ecad2 (patch)
treec6419f0f87d849c00a3075094ee28803a1431a97 /libavcodec
parent110dce96331529a13cc815d3c852aed9d37f83d0 (diff)
downloadffmpeg-bcf9d2a17242b78dc4cd56731893c9a5781ecad2.tar.gz
avcodec/wmv2dec: Check that the P frame secondary header fit in the input
Fixes: Timeout (64sec ->2 sec) Fixes: 14131/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5719879556005888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/wmv2dec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 92daa1639e..124dfdb7e0 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -230,6 +230,9 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s)
s->rl_chroma_table_index = s->rl_table_index;
}
+ if (get_bits_left(&s->gb) < 2)
+ return AVERROR_INVALIDDATA;
+
s->dc_table_index = get_bits1(&s->gb);
s->mv_table_index = get_bits1(&s->gb);