1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

vp3: avoid buffer overread in coeff decode

I couldn't measure it to be slower for normal interframe videos.
For the worst case, high-bitrate intra-only videos, it can be 0.7% slower.

Originally committed as revision 22416 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-10 00:59:32 +00:00
parent 2cbc1ec676
commit f50dafa8fc

View File

@ -941,7 +941,7 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
if (blocks_ended) if (blocks_ended)
dct_tokens[j++] = blocks_ended << 2; dct_tokens[j++] = blocks_ended << 2;
while (coeff_i < num_coeffs) { while (coeff_i < num_coeffs && get_bits_left(gb) > 0) {
/* decode a VLC into a token */ /* decode a VLC into a token */
token = get_vlc2(gb, vlc_table, 5, 3); token = get_vlc2(gb, vlc_table, 5, 3);
/* use the token to get a zero run, a coefficient, and an eob run */ /* use the token to get a zero run, a coefficient, and an eob run */