From: Monty <xiphmont@xiph.org>
Date: Mon, 1 Mar 2010 11:33:57 +0000 (+0000)
Subject: Correct an error in the integer work buffer allocation
X-Git-Tag: v1.3.3~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a60a3a59833e4f705b65d941b7e7375d2a55d1bc;p=platform%2Fupstream%2Flibvorbis.git

Correct an error in the integer work buffer allocation


svn path=/trunk/vorbis/; revision=16941
---

diff --git a/lib/mapping0.c b/lib/mapping0.c
index 2e470ae..988cfec 100644
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -255,8 +255,7 @@ static int mapping0_forward(vorbis_block *vb){
 
   int modenumber=vb->W;
   vorbis_info_mapping0 *info=ci->map_param[modenumber];
-  vorbis_look_psy *psy_look=
-    b->psy+blocktype+(vb->W?2:0);
+  vorbis_look_psy *psy_look=b->psy+blocktype+(vb->W?2:0);
 
   vb->mode=modenumber;
 
@@ -267,6 +266,7 @@ static int mapping0_forward(vorbis_block *vb){
     float *pcm     =vb->pcm[i];
     float *logfft  =pcm;
 
+    iwork[i]=_vorbis_block_alloc(vb,n/2*sizeof(**iwork));
     gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
 
     scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original
@@ -627,7 +627,6 @@ static int mapping0_forward(vorbis_block *vb){
       for(i=0;i<vi->channels;i++){
         float *mdct    =gmdct[i];
         sortindex[i]=alloca(sizeof(**sortindex)*n/2);
-        iwork[i]=_vorbis_block_alloc(vb,n/2*sizeof(**iwork));
         _vp_noise_normalize_sort(psy_look,mdct,sortindex[i]);
       }
     }