Changeset e81f6fca6f99e83338959f956b1f4d1e14602078

Timestamp:

06/29/08 00:12:00 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1214691120 +0000

git-parent:

[a11cc33695f3b4bc9f939e457bd3e5f16397968f]

git-author:

Laurent Aimar <fenrir@videolan.org> 1214691120 +0000

Message:

Fixed segfault when parsing wav file to check for dts/a52.

Files:

• modules/demux/a52.c (modified) (3 diffs)
• modules/demux/dts.c (modified) (4 diffs)

modules/demux/a52.c

@@ -75 +75 @@
-#define PCM_FRAME_SIZE (1536 * 4)
-#define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE)
+#define A52_PROBE_SIZE (512*1024)
-#define A52_MAX_HEADER_SIZE 10
-
-
-/*****************************************************************************
@@ -90 +90 @@
-
-    /* Check if we are dealing with a WAV file */
-
-
-
-
-
+
+
+
-        /* Skip the wave header */
-        i_peek = 12 + 8;
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-
@@ -107 +110 @@
-        /* Some A52 wav files don't begin with a sync code so we do a more
-         * extensive search */
-
+nt i
-        i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE);
-

modules/demux/dts.c

@@ -86 +86 @@
-        !memcmp( p_peek, "RIFF", 4 ) && !memcmp( &p_peek[8], "WAVE", 4 ) )
-    {
-        int i_size;
-
-        /* Find the wave format header */
-20
+12 + 8
-        while( memcmp( p_peek + i_peek - 8, "fmt ", 4 ) )
-        {
-
-
-
-
+
+
+
+
+
-            if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
-                return VLC_EGENERIC;
@@ -101 +100 @@
-
-        /* Sanity check the wave format header */
-
-
-
+
+
+
+
+
-        if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
-            return VLC_EGENERIC;
-size
+len
-            1 /* WAVE_FORMAT_PCM */ )
-            return VLC_EGENERIC;
-size
-
-size
+len
+
+len
-            44100 )
-            return VLC_EGENERIC;
@@ -118 +119 @@
-        while( memcmp( p_peek + i_peek - 8, "data", 4 ) )
-        {
-
-
-
-
+
+
+
+
+
-            if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek )
-                return VLC_EGENERIC;
@@ -128 +130 @@
-        /* Some DTS wav files don't begin with a sync code so we do a more
-         * extensive search */
-
+nt i
-        i_size -= DTS_MAX_HEADER_SIZE;
-