Port r17547 from Tremor.

Disallow books with dim<1 in floor0.

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

diff --git a/lib/floor0.c b/lib/floor0.c
index 121a70b..c22213b 100644 (file)
--- a/lib/floor0.c
+++ b/lib/floor0.c
@@ -92,6 +92,7 @@ static vorbis_info_floor *floor0_unpack (vorbis_info *vi,oggpack_buffer *opb){
     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;
+    if(ci->book_param[info->books[j]]->dim<1)goto err_out;
   }
   return(info);