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

[michael]

Author: michael
Date: Wed Sep 23 14:24:21 2009
New Revision: 19992

Log:
Check  res_setup->books.
15_more_residue_book_indexes.patch by chrome.

Modified:
   trunk/libavcodec/vorbis_dec.c

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	Wed Sep 23 14:17:54 2009	(r19991)
+++ trunk/libavcodec/vorbis_dec.c	Wed Sep 23 14:24:21 2009	(r19992)
@@ -663,7 +663,12 @@ static int vorbis_parse_setup_hdr_residu
         for(j=0;j<res_setup->classifications;++j) {
             for(k=0;k<8;++k) {
                 if (cascade[j]&(1<<k)) {
-                        res_setup->books[j][k]=get_bits(gb, 8);
+                    int bits=get_bits(gb, 8);
+                    if (bits>=vc->codebook_count) {
+                        av_log(vc->avccontext, AV_LOG_ERROR, "book value %d out of range. \n", bits);
+                        return 1;
+                    }
+                    res_setup->books[j][k]=bits;
 
                     AV_DEBUG("     %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]);