[FFmpeg-cvslog] r21725 - in branches/0.5: . libavcodec/vorbis_dec.c

[siretart]

Author: siretart
Date: Tue Feb  9 20:47:42 2010
New Revision: 21725

Log:
Check classbook value.
11_vorbis_residue_book_index.patch by chrome.

r19989 by michael

Modified:
   branches/0.5/   (props changed)
   branches/0.5/libavcodec/vorbis_dec.c

Modified: branches/0.5/libavcodec/vorbis_dec.c
==============================================================================
--- branches/0.5/libavcodec/vorbis_dec.c	Tue Feb  9 20:46:22 2010	(r21724)
+++ branches/0.5/libavcodec/vorbis_dec.c	Tue Feb  9 20:47:42 2010	(r21725)
@@ -635,6 +635,10 @@ static int vorbis_parse_setup_hdr_residu
         res_setup->partition_size=get_bits(gb, 24)+1;
         res_setup->classifications=get_bits(gb, 6)+1;
         res_setup->classbook=get_bits(gb, 8);
+        if (res_setup->classbook>=vc->codebook_count) {
+            av_log(vc->avccontext, AV_LOG_ERROR, "classbook value %d out of range. \n", res_setup->classbook);
+            return 1;
+        }
 
         AV_DEBUG("    begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
           res_setup->classifications, res_setup->classbook);