diff options
| author | Google Chrome <> | 2010-02-09 19:46:22 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-02-09 19:46:22 +0000 |
| commit | 49487dfd780bf0e33ca9aec4210f6f1eef8d8ba7 (patch) | |
| tree | 4218e3ef44043a3424d886e73d4c76413b9c97a5 | |
| parent | 0d3f25eb483f19a34e3354970333b87e04120ae2 (diff) | |
Fix book_idx check.
25_vorbis_floor0_index.patch by chrome.
backport r19984 by michael
Originally committed as revision 21724 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -rw-r--r-- | libavcodec/vorbis_dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 305ceadaa1..29e7bdbf41 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -558,12 +558,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; } } |