Changeset 00f78a1e82c9e1d6948206fba58159cde39998dd

Timestamp:

10/07/05 10:13:48 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1120983228 +0000

git-parent:

[5585f98e36b6dd1ef123bec4b8854fa40e09adbb]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1120983228 +0000

Message:

strncmp => memcmp (refs #258)

ogg.c : FIXME FIXME FIXME
I don't know Ogg format well, but don't we have a possible out-of-bound
read at line 1346 and following ??

Files:

• modules/demux/dts.c (modified) (3 diffs)
• modules/demux/ogg.c (modified) (17 diffs)

modules/demux/dts.c

@@ -79 +79 @@
-    /* Check if we are dealing with a WAV file */
-    if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 &&
-strncmp( p_peek, "RIFF", 4 ) && !strn
+memcmp( p_peek, "RIFF", 4 ) && !mem
-    {
-        int i_size;
@@ -85 +85 @@
-        /* Find the wave format header */
-        i_peek = 20;
-strn
+mem
-        {
-            i_size = GetDWLE( p_peek + i_peek - 4 );
@@ -111 +111 @@
-
-        /* Skip the wave header */
-strn
+mem
-        {
-            i_size = GetDWLE( p_peek + i_peek - 4 );

modules/demux/ogg.c

@@ -184 +184 @@
-    /* Check if we are dealing with an ogg stream */
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
-strn
+mem
-    {
-        return VLC_EGENERIC;
@@ -277 +277 @@
-                if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
-                        oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );
@@ -284 +284 @@
-                else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
-                        oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
@@ -405 +405 @@
-    demux_sys_t *p_ogg = p_demux->p_sys  ;
-    int i_read = 0;
-byte_t
+char
-
-    while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
@@ -485 +485 @@
-
-    if( p_oggpacket->bytes >= 7 &&
-strn
+mem
-    {
-        /* it's an Annodex packet -- skip it (do nothing) */
@@ -491 +491 @@
-    }
-    else if( p_oggpacket->bytes >= 7 &&
-strn
+mem
-    {
-        /* it's an AnxData packet -- skip it (do nothing) */
@@ -757 +757 @@
-                /* Check for Vorbis header */
-                if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
@@ -764 +764 @@
-                /* Check for Speex header */
-                else if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadSpeexHeader( p_stream, &oggpacket );
@@ -774 +774 @@
-                /* Check for Flac header (< version 1.1.1) */
-                else if( oggpacket.bytes >= 4 &&
-strn
+mem
-                {
-                    msg_Dbg( p_demux, "found FLAC header" );
@@ -788 +788 @@
-                /* Check for Flac header (>= version 1.1.1) */
-                else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
-strn
-strn
+mem
+mem
-                {
-                    int i_packets = ((int)oggpacket.packet[7]) << 8 |
@@ -807 +807 @@
-                /* Check for Theora header */
-                else if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );
@@ -817 +817 @@
-                /* Check for Tarkin header */
-                else if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    oggpack_buffer opb;
@@ -837 +837 @@
-                /* Check for Annodex header */
-                else if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
@@ -847 +847 @@
-                /* Check for Annodex header */
-                else if( oggpacket.bytes >= 7 &&
-strn
+mem
-                {
-                    Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
@@ -853 +853 @@
-                }
-                else if( oggpacket.bytes >= 142 &&
-strn
+mem
-                                   "Direct Show Samples embedded in Ogg", 35 ))
-                {
@@ -1311 +1311 @@
-                                   ogg_packet *p_oggpacket )
-{
-strn
+mem
-    {
-        oggpack_buffer opb;
@@ -1329 +1329 @@
-        timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
-    }
-strn
+mem
-    {
-        uint64_t granule_rate_numerator;