[xiph-commits] r18311 - icecast/trunk/libshout/src

[gmaxwell at svn.xiph.org]

Author: gmaxwell
Date: 2012-05-24 13:46:09 -0700 (Thu, 24 May 2012)
New Revision: 18311

Modified:
   icecast/trunk/libshout/src/opus.c
Log:
Improvements to the Opus header rejection logic.

Modified: icecast/trunk/libshout/src/opus.c
===================================================================
--- icecast/trunk/libshout/src/opus.c	2012-05-24 20:25:30 UTC (rev 18310)
+++ icecast/trunk/libshout/src/opus.c	2012-05-24 20:46:09 UTC (rev 18311)
@@ -163,7 +163,9 @@
       h->stream_map[0]=0;
       h->stream_map[1]=1;
    }
-   if (h->version==0 && p.pos != len)
+   /*For version 0/1 we know there won't be any more data
+     so reject any that have data past the end.*/
+   if ((h->version==0 || h->version==1) && p.pos != len)
       return 0;
    return 1;
 }