[FFmpeg-cvslog] r19373 - trunk/libavcodec/vorbis_dec.c

[reimar]

Author: reimar
Date: Wed Jul  8 21:31:04 2009
New Revision: 19373

Log:
Make sure that values generated for ff_vorbis_len2vlc in
vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).

Modified:
   trunk/libavcodec/vorbis_dec.c

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	Wed Jul  8 16:58:16 2009	(r19372)
+++ trunk/libavcodec/vorbis_dec.c	Wed Jul  8 21:31:04 2009	(r19373)
@@ -292,7 +292,7 @@ static int vorbis_parse_setup_hdr_codebo
             AV_DEBUG(" ordered, current length: %d \n", current_length);  //FIXME
 
             used_entries=entries;
-            for(;current_entry<used_entries;++current_length) {
+            for(;current_entry<used_entries && current_length <= 32;++current_length) {
                 uint_fast16_t i, number;
 
                 AV_DEBUG(" number bits: %d ", ilog(entries - current_entry));