[xiph-commits] r14512 - trunk/speex/src

[gmaxwell at svn.xiph.org]

Author: gmaxwell
Date: 2008-02-14 13:52:20 -0800 (Thu, 14 Feb 2008)
New Revision: 14512

Modified:
   trunk/speex/src/speexdec.c
Log:
Correct fix from r14511. Jm advises Speex packets can be <5 bytes.


Modified: trunk/speex/src/speexdec.c
===================================================================
--- trunk/speex/src/speexdec.c	2008-02-14 20:54:42 UTC (rev 14511)
+++ trunk/speex/src/speexdec.c	2008-02-14 21:52:20 UTC (rev 14512)
@@ -639,9 +639,9 @@
          last_granule = page_granule;
          /*Extract all available packets*/
          packet_no=0;
-         while (!eos && ogg_stream_packetout(&os, &op) == 1 && op.bytes>=5)
+         while (!eos && ogg_stream_packetout(&os, &op) == 1)
          {
-	    if (!memcmp(op.packet, "Speex", 5)) {
+	    if (op.bytes>=5 && !memcmp(op.packet, "Speex", 5)) {
 	       speex_serialno = os.serialno;
 	    }
 	    if (speex_serialno == -1 || os.serialno != speex_serialno)