media/libvorbis/bug487519.patch
author Marco Bonardo <mbonardo@mozilla.com>
Tue, 22 Jun 2010 03:49:47 +0200
changeset 43944 d688a915d1d461337f5cd8401248d6afd1a22ff0
parent 31034 c6692a8f3f2725faadef43edd3142e533b452e62
permissions -rw-r--r--
backout bug 547190 due to test failure

diff --git a/media/libvorbis/lib/vorbis_synthesis.c b/media/libvorbis/lib/vorbis_synthesis.c
index 8872f57..b7b2399 100644
--- a/media/libvorbis/lib/vorbis_synthesis.c
+++ b/media/libvorbis/lib/vorbis_synthesis.c
@@ -43,9 +43,14 @@ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
 
   /* read our mode and pre/post windowsize */
   mode=oggpack_read(opb,b->modebits);
-  if(mode==-1)return(OV_EBADPACKET);
+  if(mode==-1) {
+    return(OV_EBADPACKET);
+  }
 
   vb->mode=mode;
+  if(!ci->mode_param[mode]) {
+    return(OV_EBADPACKET); 
+  }
   vb->W=ci->mode_param[mode]->blockflag;
   if(vb->W){