Changeset 2536e65c1266d9ec992acf4c516d8eb90acc81b3

Timestamp:

02/07/08 21:57:31 (5 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[a7466071b44f9b07a1e7ff1d35ed70a954052ebe]

git-author:

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

Message:

Big clean up of ASF demuxer with a lot of over read fixed.

Files:

• modules/demux/asf/libasf.c (modified) (18 diffs)

modules/demux/asf/libasf.c

@@ -45 +45 @@
-    (guid).v4[4],(guid).v4[5],(guid).v4[6],(guid).v4[7]
-
+/* Helpers:
+ * They ensure that invalid reads will not create problems.
+ * They are expansion safe
+ * They make the following assumptions:
+ *  const uint8_t *p_peek exists and points to the start of a buffer
+ *  int i_peek gives the size of the buffer pointed by p_peek
+ *  const uint8_t *p_data exits and points to the data inside p_peek to be read.
+ */
+/* ASF_HAVE(n):
+ *  Check that n bytes can be read */
+static inline bool AsfObjectHelperHave( const uint8_t *p_peek, int i_peek, const uint8_t *p_current, int i_wanted )
+{
+    if( i_wanted < 0 || i_wanted > i_peek )
+        return false;
+    return &p_current[i_wanted] <= &p_peek[i_peek];
+}
+#define ASF_HAVE(n) AsfObjectHelperHave( p_peek, i_peek, p_data, n )
+
+/* ASF_SKIP(n)
+ *  Skip n bytes if possible */
+static inline void AsfObjectHelperSkip( const uint8_t *p_peek, int i_peek, uint8_t **pp_data, int i_wanted )
+{
+    if( AsfObjectHelperHave( p_peek, i_peek, *pp_data, i_wanted ) )
+        *pp_data += i_wanted;
+    else
+        *pp_data = (uint8_t*)&p_peek[i_peek];
+}
+#define ASF_SKIP(n) AsfObjectHelperSkip( p_peek, i_peek, (uint8_t**)&p_data, n )
+
+/* ASF_READX()
+ *  Read X byte if possible, else return 0 */
+#define ASF_FUNCTION_READ_X(type, x, cmd ) \
+static inline type AsfObjectHelperRead##x( const uint8_t *p_peek, int i_peek, uint8_t **pp_data ) { \
+    uint8_t *p_data = *pp_data; \
+    type i_ret = 0;  \
+    if( ASF_HAVE(x) )   \
+        i_ret = cmd;    \
+    ASF_SKIP(x);        \
+    *pp_data = p_data;  \
+    return i_ret;   }
+ASF_FUNCTION_READ_X( uint8_t,  1, *p_data )
+ASF_FUNCTION_READ_X( uint16_t, 2, GetWLE(p_data) )
+ASF_FUNCTION_READ_X( uint32_t, 4, GetDWLE(p_data) )
+ASF_FUNCTION_READ_X( uint64_t, 8, GetQWLE(p_data) )
+#define ASF_READ1() AsfObjectHelperRead1( p_peek, i_peek, (uint8_t**)&p_data )
+#define ASF_READ2() AsfObjectHelperRead2( p_peek, i_peek, (uint8_t**)&p_data )
+#define ASF_READ4() AsfObjectHelperRead4( p_peek, i_peek, (uint8_t**)&p_data )
+#define ASF_READ8() AsfObjectHelperRead8( p_peek, i_peek, (uint8_t**)&p_data )
+
+/* ASF_READS(n)
+ *  Read a string of n/2 wchar long ie n bytes. Do a stupid conversion (suppose latin1)
+ *  Return allocated "" if not possible */
+static char *AsfObjectHelperReadString( const uint8_t *p_peek, int i_peek, uint8_t **pp_data, int i_size )
+{
+    uint8_t *p_data = *pp_data;
+    char *psz_string;
+    if( ASF_HAVE(i_size) )
+    {
+        psz_string = calloc( i_size/2 + 1, sizeof( char ) );
+        if( psz_string )
+        {
+            int i;
+            for( i = 0; i < i_size/2; i++ )
+                psz_string[i] = GetWLE( &p_data[2*i] );
+            psz_string[i_size/2] = '\0'; \
+        }
+    }
+    else
+    {
+        psz_string = strdup("");
+    }
+    ASF_SKIP(i_size);
+    *pp_data = p_data;
+    return psz_string;
+}
+#define ASF_READS(n) AsfObjectHelperReadString( p_peek, i_peek, (uint8_t**)&p_data, n )
+
-/****************************************************************************
- *
@@ -336 +413 @@
-        int i_name;
-        int i_data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-
-        /* Read name */
-
-
-
-
-
-
+
-
-        /* Read data */
-        if( p_record->i_type == ASF_METADATA_TYPE_STRING )
-        {
-malloc( i_data/2 + 1
+ASF_READS( i_data
-            p_record->i_data = i_data/2; /* FIXME Is that needed ? */
-            for( j = 0; j < i_data/2; j++ )
-            {
-                p_record->p_data[j] = GetWLE( &p_data[2*j] );
-            }
-            p_record->p_data[j] = 0; /* just to make sure */
-
-            p_data += i_data;
-        }
-        else if( p_record->i_type == ASF_METADATA_TYPE_BYTE )
@@ -385 +448 @@
-        else if( p_record->i_type == ASF_METADATA_TYPE_QWORD )
-        {
-GetQWLE( p_data ); p_data += 8
+ASF_READ8()
-        }
-        else if( p_record->i_type == ASF_METADATA_TYPE_DWORD )
-        {
-GetDWLE( p_data ); p_data += 4
+ASF_READ4()
-        }
-        else if( p_record->i_type == ASF_METADATA_TYPE_WORD )
-        {
-GetWLE( p_data ); p_data += 2
+ASF_READ2()
-        }
-        else if( p_record->i_type == ASF_METADATA_TYPE_BOOL )
-        {
-GetWLE( p_data ); p_data += 2
+ASF_READ2()
-        }
-        else
@@ -446 +509 @@
-    if( p_he->i_header_extension_size )
-    {
+        if( i_peek-46 < (int)p_he->i_header_extension_size )
+            return VLC_EGENERIC;
+
-        p_he->p_header_extension_data =
-            malloc( p_he->i_header_extension_size );
+        if( !p_he->p_header_extension_data )
+            return VLC_ENOMEM;
+
-        memcpy( p_he->p_header_extension_data, p_peek + 46,
-                p_he->i_header_extension_size );
@@ -606 +675 @@
-        p_cl->codec = calloc( p_cl->i_codec_entries_count,
-                              sizeof( asf_codec_entry_t ) );
+        if( !p_cl->codec )
+            return VLC_ENOMEM;
-
-        for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
-        {
-            asf_codec_entry_t *p_codec = &p_cl->codec[i_codec];
-
-
-
+
+
+
+
+
+
+
+
+
+
-            /* codec name */
-
-
-
-
-
-
-
-
+
-
-            /* description */
-
-
-
-
-
-
-
-
+
-
-            /* opaque information */
-GetWLE( p_data ); p_data += 2
-
+ASF_READ2()
+&& ASF_HAVE( p_codec->i_information_length ) 
-            {
-                p_codec->p_information = malloc( p_codec->i_information_length );
@@ -646 +710 @@
-            }
-        }
-
-
-
-
+
-    }
-
@@ -659 +720 @@
-    for( i_codec = 0; i_codec < p_cl->i_codec_entries_count; i_codec++ )
-    {
-
+
+
-        msg_Dbg( s, "  - codec[%d] %s name:\"%s\" "
-                 "description:\"%s\" information_length:%d",
-codec.
-codec.
+p_codec->
+p_codec->
-                 "audio" : "unknown" ),
-
-
-
+
+
-    }
-#endif
@@ -724 +785 @@
-
-    p_data = p_peek + 24;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    GETSTRINGW( p_cd->psz_title, i_title );
@@ -779 +846 @@
-    p_data = &p_peek[24];
-
-GetWLE( &p_data[0] ); p_data += 2
+ASF_READ2()
-    if( p_ll->i_language > 0 )
-    {
@@ -786 +853 @@
-        for( i = 0; i < p_ll->i_language; i++ )
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -838 +896 @@
-    p_data = &p_peek[24];
-
-
-
+
+
+
-    for( i = 0; i < p_sb->i_bitrate; i++ )
-    {
-
-
-
-
-
+
+
+
+
+
+
-
-#ifdef ASF_DEBUG
@@ -901 +961 @@
-    for( i = 0; i < p_esp->i_stream_name_count; i++ )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    for( i = 0; i < p_esp->i_payload_extension_system_count; i++ )
-    {
-
-
-
-
+
+
+
-    }
-
@@ -1004 +1051 @@
-
-    ASF_GetGUID( &p_ae->type, &p_data[0] );
-
-
-
-
-
+
+
+
+
-    for( i = 0; i < p_ae->i_stream_number_count; i++ )
-    {
-
-
-
+
+
+
+
+
- 
-#ifdef ASF_DEBUG
@@ -1045 +1093 @@
-    p_data = &p_peek[24];
-
-
-
+
-
-    p_sp->pi_priority_flag = calloc( p_sp->i_priority_count, sizeof(int) );
@@ -1054 +1101 @@
-    for( i = 0; i < p_sp->i_priority_count; i++ )
-    {
-
-
-
+
+
+
+
+
+
+
-#ifdef ASF_DEBUG
-    msg_Dbg( s, "read \"stream prioritization object\"" );
@@ -1090 +1141 @@
-    p_data = &p_peek[24];
-
-GetWLE( p_data ); p_data += 2
-
+ASF_READ2()
+ 
-    p_ec->ppsz_value = calloc( p_ec->i_count, sizeof(char*) );
+    if( !p_ec->ppsz_name || !p_ec->ppsz_value )
+    {
+        free( p_ec->ppsz_name );
+        free( p_ec->ppsz_value );
+        return VLC_ENOMEM;
+    }
-    for( i = 0; i < p_ec->i_count; i++ )
-    {
-        int i_size;
-        int i_type;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        /* Grrr */
-
-
+
+
+
-        if( i_type == 0 )
-        {
-GETSTRINGW( p_ec->ppsz_value[i],
+p_ec->ppsz_value[i] = ASF_READS(
-        }
-        else if( i_type == 1 )
-        {
+            /* Byte array */
+            static const char hex[16] = "0123456789ABCDEF";
-            int j;
-
+
-            p_ec->ppsz_value[i] = malloc( 2*i_size + 1 );
-            for( j = 0; j < i_size; j++ )
-            {
-static const char hex[16] = "0123456789ABCDEF"
-p_data[0]
-p_data[0]
+const uint8_t v = ASF_READ1()
+v
+v
-            }
-            p_ec->ppsz_value[i][2*i_size] = '\0';
@@ -1133 +1186 @@
-        {
-            /* Bool */
-
+
+
-        }
-        else if( i_type == 3 )
-        {
-            /* DWord */
-GetDWLE(p_data)
+ASF_READ4() 
-        }
-        else if( i_type == 4 )
-        {
-            /* QWord */
-GetQWLE(p_data)
+ASF_READ8() 
-        }
-        else if( i_type == 5 )
-        {
-            /* Word */
-GetWLE(p_data)
+ASF_READ2() 
-        }
-        else
+        {
-            p_ec->ppsz_value[i] = NULL;
-
-
-
-
-
-
-
-
+
+
+
+
-
-#ifdef ASF_DEBUG
@@ -1407 +1458 @@
-    { &asf_object_stream_type_command, "Stream Type Command" },
-    { &asf_object_language_list, "Language List" },
-o
+
-    { &asf_object_padding, "Padding" },
-    { &asf_object_extended_stream_properties, "Extended Stream Properties" },