[xiph-commits] r15532 - in trunk/vorbis: doc/xml lib

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-11-24 17:46:22 -0800 (Mon, 24 Nov 2008)
New Revision: 15532

Modified:
   trunk/vorbis/doc/xml/08-residue.xml
   trunk/vorbis/lib/res0.c
Log:
Fix for bug #1456-- the 'bulletproofing' from CVE-2008-1420 inadvertantly 
rejects a harmless/legal (if suboptimal) codebook arrangement that was 
apparently used in 1.0b1.



Modified: trunk/vorbis/doc/xml/08-residue.xml
===================================================================
--- trunk/vorbis/doc/xml/08-residue.xml	2008-11-24 23:50:06 UTC (rev 15531)
+++ trunk/vorbis/doc/xml/08-residue.xml	2008-11-25 01:46:22 UTC (rev 15532)
@@ -220,7 +220,7 @@
 <varname>[residue_classifications]</varname>, overdetermines to
 possible number of classification codewords.  If
 <varname>[residue_classifications]</varname>^<varname>[residue_classbook]</varname>.dimensions
-does not equal <varname>[residue_classbook]</varname>.entries, the
+exceeds <varname>[residue_classbook]</varname>.entries, the
 bitstream should be regarded to be undecodable. </para>
 
 <para>

Modified: trunk/vorbis/lib/res0.c
===================================================================
--- trunk/vorbis/lib/res0.c	2008-11-24 23:50:06 UTC (rev 15531)
+++ trunk/vorbis/lib/res0.c	2008-11-25 01:46:22 UTC (rev 15532)
@@ -234,7 +234,6 @@
       if(partvals > entries) goto errout;
       dim--;
     }
-    if(partvals != entries) goto errout;
   }
 
   return(info);