[xiph-commits] r17522 - trunk/Tremor

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2010-10-13 17:07:49 -0700 (Wed, 13 Oct 2010)
New Revision: 17522

Modified:
   trunk/Tremor/res012.c
Log:
Port of r16181 from libvorbis.

First half of fix for https://bugzilla.mozilla.org/show_bug.cgi?id=500254
Residue code was not checking that its partition books were books with
 specified/populated value mappings.


Modified: trunk/Tremor/res012.c
===================================================================
--- trunk/Tremor/res012.c	2010-10-14 00:00:51 UTC (rev 17521)
+++ trunk/Tremor/res012.c	2010-10-14 00:07:49 UTC (rev 17522)
@@ -110,8 +110,10 @@
     info->booklist[j]=oggpack_read(opb,8);
 
   if(info->groupbook>=ci->books)goto errout;
-  for(j=0;j<acc;j++)
+  for(j=0;j<acc;j++){
     if(info->booklist[j]>=ci->books)goto errout;
+    if(ci->book_param[info->booklist[j]]->maptype==0)goto errout;
+  }
 
   /* verify the phrasebook is not specifying an impossible or
      inconsistent partitioning scheme. */