summaryrefslogtreecommitdiff
path: root/libavcodec/vc1.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/vc1.c')
-rw-r--r--libavcodec/vc1.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index b7140c089c..40e2b4d692 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -672,6 +672,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
if (v->s.pict_type == AV_PICTURE_TYPE_P)
v->rnd ^= 1;
+ if (get_bits_left(gb) < 5)
+ return AVERROR_INVALIDDATA;
/* Quantizer stuff */
pqindex = get_bits(gb, 5);
if (!pqindex)
@@ -764,6 +766,9 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
"Imode: %i, Invert: %i\n", status>>1, status&1);
+ if (get_bits_left(gb) < 4)
+ return AVERROR_INVALIDDATA;
+
/* Hopefully this is correct for P-frames */
v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables
v->cbptab = get_bits(gb, 2);