Commit fix to Moz Bugzilla #719612 (along with spec update in previous commit)

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

diff --git a/configure.ac b/configure.ac
index 98b78ac..b349610 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Initialization and Versioning
 dnl ------------------------------------------------
 
 
-AC_INIT([libvorbis],[1.3.2],[vorbis-dev@xiph.org])
+AC_INIT([libvorbis],[1.3.3pre],[vorbis-dev@xiph.org])
 
 AC_CONFIG_SRCDIR([lib/mdct.c])
 
@@ -25,15 +25,15 @@ dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
 
 V_LIB_CURRENT=4
-V_LIB_REVISION=5
+V_LIB_REVISION=6
 V_LIB_AGE=4
 
 VF_LIB_CURRENT=6
-VF_LIB_REVISION=4
+VF_LIB_REVISION=5
 VF_LIB_AGE=3
 
 VE_LIB_CURRENT=2
-VE_LIB_REVISION=8
+VE_LIB_REVISION=9
 VE_LIB_AGE=0
 
 AC_SUBST(V_LIB_CURRENT)

diff --git a/lib/floor1.c b/lib/floor1.c
index a9a873a..54f7173 100644 (file)
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -167,6 +167,7 @@ static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){
 
   for(j=0,k=0;j<info->partitions;j++){
     count+=info->class_dim[info->partitionclass[j]];
+    if(count>VIF_POSIT) goto err_out;
     for(;k<count;k++){
       int t=info->postlist[k+2]=oggpack_read(opb,rangebits);
       if(t<0 || t>=(1<<rangebits))

diff --git a/lib/info.c b/lib/info.c
index 76347ef..45655c2 100644 (file)
--- a/lib/info.c
+++ b/lib/info.c
@@ -31,8 +31,8 @@
 #include "misc.h"
 #include "os.h"
 
-#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.2"
-#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20101101 (Schaufenugget)"
+#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.3pre"
+#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20120120 (Omnipresent)"
 
 /* helpers */
 static int ilog2(unsigned int v){