Instead of SIGFPE when bytespersample is zero or negative, return OV_EINVAL

[platform/upstream/libvorbis.git] / lib / sharedbook.c

diff --git a/lib/sharedbook.c b/lib/sharedbook.c
index 8d73daa..cecfcbc 100644 (file)
--- a/lib/sharedbook.c
+++ b/lib/sharedbook.c
@@ -50,7 +50,7 @@ long _float32_pack(float val){
     sign=0x80000000;
     val= -val;
   }
-  exp= floor(log(val)/log(2.f)+.001); //+epsilon
+  exp= floor(log(val)/log(2.f)+.001); /* +epsilon */
   mant=rint(ldexp(val,(VQ_FMAN-1)-exp));
   exp=(exp+VQ_FEXP_BIAS)<<VQ_FMAN;
 
@@ -68,7 +68,7 @@ float _float32_unpack(long val){
     exp=63;
   }
   if (exp<-63){
-    exp-63;
+    exp=-63;
   }
   return(ldexp(mant,exp));
 }
@@ -302,7 +302,7 @@ int vorbis_book_init_encode(codebook *c,const static_codebook *s){
   c->used_entries=s->entries;
   c->dim=s->dim;
   c->codelist=_make_words(s->lengthlist,s->entries,0);
-  //c->valuelist=_book_unquantize(s,s->entries,NULL);
+  /* c->valuelist=_book_unquantize(s,s->entries,NULL); */
   c->quantvals=_book_maptype1_quantvals(s);
   c->minval=(int)rint(_float32_unpack(s->q_min));
   c->delta=(int)rint(_float32_unpack(s->q_delta));
@@ -581,6 +581,7 @@ void run_test(static_codebook *b,float *comp){
       exit(1);
     }
   }
+  free(out);
 }
 
 int main(){