From 96651e790cbaf5f0002e02f81606658198d07d18 Mon Sep 17 00:00:00 2001 From: Google Chrome <> Date: Wed, 23 Sep 2009 10:45:14 +0000 Subject: [PATCH] Fix book_idx check. 25_vorbis_floor0_index.patch by chrome. Originally committed as revision 19984 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vorbis_dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 28417ee8f..ce5a139ef 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;idxdata.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; } } -- 2.11.0