Merge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'

* commit '28eddef689f2b4843a84f7d05fd9614246f92cc4':
  hq_hqa: Validate get_vlc2 return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-23 21:57:12 +02:00
commit 400810abee

View File

@ -76,6 +76,9 @@ static int hq_decode_block(HQContext *c, GetBitContext *gb, int16_t block[64],
for (;;) {
val = get_vlc2(gb, c->hq_ac_vlc.table, 9, 2);
if (val < 0)
return AVERROR_INVALIDDATA;
pos += ff_hq_ac_skips[val];
if (pos >= 64)
break;