[SCM] libav/experimental: Vorbis specs requires blocksize_1 >= blocksize_0, error if it's false. Predict buffer size from blocksize_1 and number of channels and make sure this does not exceed AVCODEC_MAX_AUDIO_FRAME_SIZE

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f267587ecea7a98d398d0fb74e1e04668ddf26e3
Author: Uoti Urpala <uoti.urpala at pp1.inet.fi>
Date:   Sun Apr 23 21:11:31 2006 +0000

    Vorbis specs requires blocksize_1 >= blocksize_0, error if it's false.
    Predict buffer size from blocksize_1 and number of channels and make
    sure this does not exceed AVCODEC_MAX_AUDIO_FRAME_SIZE
    
    Patch by Uoti Urpala >>> uoti |.| urpala |@| pp1 |.| inet |.| fi <<<
    
    Originally committed as revision 5313 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 0b4b8e1..2e9528e 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -872,10 +872,17 @@ static int vorbis_parse_id_hdr(vorbis_context *vc){
     bl1=get_bits(gb, 4);
     vc->blocksize_0=(1<<bl0);
     vc->blocksize_1=(1<<bl1);
-    if (bl0>13 || bl0<6 || bl1>13 || bl1<6) {
+    if (bl0>13 || bl0<6 || bl1>13 || bl1<6 || bl1<bl0) {
         av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
         return 3;
     }
+    // output format int16
+    if (vc->blocksize_1/2 * vc->audio_channels * 2 >
+                                             AVCODEC_MAX_AUDIO_FRAME_SIZE) {
+        av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes "
+               "output packets too large.\n");
+        return 4;
+    }
     vc->swin=vwin[bl0-6];
     vc->lwin=vwin[bl1-6];
 

-- 
Libav/FFmpeg packaging