[SCM] libav/experimental: Check dimensions against 0 too. 39_vorbis_zero_dims.patch from chrome

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


The following commit has been merged in the experimental branch:
commit 98f7bcb119c5c3517c811350fe1451cf3a83f9c9
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Sep 23 08:35:29 2009 +0000

    Check dimensions against 0 too.
    39_vorbis_zero_dims.patch from chrome
    
    Originally committed as revision 19976 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index 00542b9..25cfb31 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -244,8 +244,8 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) {
         }
 
         codebook_setup->dimensions=get_bits(gb, 16);
-        if (codebook_setup->dimensions>16) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions);
+        if (codebook_setup->dimensions>16||codebook_setup->dimensions==0) {
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is invalid (%d). \n", cb, codebook_setup->dimensions);
             goto error;
         }
         entries=get_bits(gb, 24);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list