summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-31 22:00:35 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-28 18:33:20 +0200
commit7f7af9e294f8bc00756922ab088430ea5b9d7498 (patch)
tree0105570a7a77c78ac58517db7bab3491bcd07a45 /libavcodec
parentcf41da2ad2ec89a1e1c1ef3ca4f6a5b416f4104e (diff)
avcodec/vc1: check REFDIST
"9.1.1.43 P Reference Distance (REFDIST)" "The value of REFDIST shall be less than, or equal to, 16." Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index e102b931d8..42bfca55b1 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -933,7 +933,9 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
else if ((v->s.pict_type != AV_PICTURE_TYPE_B) && (v->s.pict_type != AV_PICTURE_TYPE_BI)) {
v->refdist = get_bits(gb, 2);
if (v->refdist == 3)
- v->refdist += get_unary(gb, 0, 16);
+ v->refdist += get_unary(gb, 0, 14);
+ if (v->refdist > 16)
+ return AVERROR_INVALIDDATA;
}
if ((v->s.pict_type == AV_PICTURE_TYPE_B) || (v->s.pict_type == AV_PICTURE_TYPE_BI)) {
if (read_bfraction(v, gb) < 0)