diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-31 22:00:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:46 +0100 |
| commit | bea0915aafe81babea34bb9909409fc39b3ed1d6 (patch) | |
| tree | 55674c725cb5afeac5d89ed0f60c74f12785c679 | |
| parent | 860ae495c723c542e1fa52dfdf70991cfe11d17c (diff) | |
| download | ffmpeg-bea0915aafe81babea34bb9909409fc39b3ed1d6.tar.gz | |
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>
(cherry picked from commit 7f7af9e294f8bc00756922ab088430ea5b9d7498)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vc1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 48a2cc1e48..501e1ece5e 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -937,7 +937,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) |