RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vorbisdec: Check VLC tables during use instead of setup 

Fixes regression and Ticket2720

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-01 02:09:29 +02:00
parent ae038c0914
commit 709cae2bcb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vorbisdec.c
View File

@ -422,11 +422,6 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
} }
// Initialize VLC table // Initialize VLC table
if (entries <= 0) {
av_log(vc->avctx, AV_LOG_ERROR, "Invalid codebook entry count\n");
ret = AVERROR_INVALIDDATA;
goto error;
}
if (ff_vorbis_len2vlc(tmp_vlc_bits, tmp_vlc_codes, entries)) { if (ff_vorbis_len2vlc(tmp_vlc_bits, tmp_vlc_codes, entries)) {
av_log(vc->avctx, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n"); av_log(vc->avctx, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n");
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
@ -1235,8 +1230,11 @@ static int vorbis_floor1_decode(vorbis_context *vc,
cval = cval >> cbits; cval = cval >> cbits;
if (book > -1) { if (book > -1) {
floor1_Y[offset+j] = get_vlc2(gb, vc->codebooks[book].vlc.table, int v = get_vlc2(gb, vc->codebooks[book].vlc.table,
vc->codebooks[book].nb_bits, 3); vc->codebooks[book].nb_bits, 3);
if (v < 0)
return AVERROR_INVALIDDATA;
floor1_Y[offset+j] = v;
} else { } else {
floor1_Y[offset+j] = 0; floor1_Y[offset+j] = 0;
} }
@ -1330,6 +1328,9 @@ static av_always_inline int setup_classifs(vorbis_context *vc,
av_dlog(NULL, "Classword: %u\n", temp); av_dlog(NULL, "Classword: %u\n", temp);
if ((int)temp < 0)
return temp;
av_assert0(vr->classifications > 1); //needed for inverse[] av_assert0(vr->classifications > 1); //needed for inverse[]
if (temp <= 65536) { if (temp <= 65536) {