[SCM] libav/experimental: Make sure that values generated for ff_vorbis_len2vlc in vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:48:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 1de4ba71555fcd2cc3d9bcef004c2c70b475a465
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Wed Jul 8 19:31:04 2009 +0000

    Make sure that values generated for ff_vorbis_len2vlc in
    vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).
    
    Originally committed as revision 19373 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index d5d2972..bb582c2 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -292,7 +292,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) {
             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));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list