summaryrefslogtreecommitdiff
path: root/libavcodec/vorbis_dec.c
diff options
context:
space:
mode:
authorGoogle Chrome <>2009-09-23 10:45:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-09-23 10:45:14 +0000
commit96651e790cbaf5f0002e02f81606658198d07d18 (patch)
treee75f8cf6fb88160c1bb5ae4b6ba17bb6237701a1 /libavcodec/vorbis_dec.c
parentd70fa8f131699fa1889cf65cc88563d000c4e1ef (diff)
Fix book_idx check.
25_vorbis_floor0_index.patch by chrome. Originally committed as revision 19984 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vorbis_dec.c')
-rw-r--r--libavcodec/vorbis_dec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index 28417ee8f0..ce5a139ef4 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -553,12 +553,11 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) {
uint_fast8_t book_idx;
for (idx=0;idx<floor_setup->data.t0.num_books;++idx) {
book_idx=get_bits(gb, 8);
+ if (book_idx>=vc->codebook_count)
+ return 1;
floor_setup->data.t0.book_list[idx]=book_idx;
if (vc->codebooks[book_idx].dimensions > max_codebook_dim)
max_codebook_dim=vc->codebooks[book_idx].dimensions;
-
- if (floor_setup->data.t0.book_list[idx]>vc->codebook_count)
- return 1;
}
}