Port r17545 from Tremor.

Check that floor0 books all have a value mapping.

svn path=/trunk/vorbis/; revision=17557

diff --git a/lib/floor0.c b/lib/floor0.c
index adc2bcf..121a70b 100644 (file)
--- a/lib/floor0.c
+++ b/lib/floor0.c
@@ -91,6 +91,7 @@ static vorbis_info_floor *floor0_unpack (vorbis_info *vi,oggpack_buffer *opb){
   for(j=0;j<info->numbooks;j++){
     info->books[j]=oggpack_read(opb,8);
     if(info->books[j]<0 || info->books[j]>=ci->books)goto err_out;
+    if(ci->book_param[info->books[j]]->maptype==0)goto err_out;
   }
   return(info);