Changeset 99f80c178a8236c18400150fff4d436f127e41b8

Timestamp:

03/16/08 22:30:41 (5 months ago)

Author:

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

git-committer:

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

git-parent:

[7061a05d461803044bd98b63fed47340736e9809]

git-author:

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

Message:

Handle all memory errors in MP4 esds

Files:

• modules/demux/mp4/libmp4.c (modified) (4 diffs)

modules/demux/mp4/libmp4.c

@@ -886 +886 @@
-}
-
+
+static void MP4_FreeBox_esds( MP4_Box_t *p_box )
+{
+    FREENULL( p_box->data.p_esds->es_descriptor.psz_URL );
+    if( p_box->data.p_esds->es_descriptor.p_decConfigDescr )
+    {
+        FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr->p_decoder_specific_info );
+        FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr );
+    }
+}
+
-static int MP4_ReadBox_esds( stream_t *p_stream, MP4_Box_t *p_box )
-{
@@ -892 +903 @@
-    unsigned int i_flags;
-    unsigned int i_type;
+    unsigned int code = 0;
-
-    MP4_READBOX_ENTER( MP4_Box_data_esds_t );
@@ -959 +971 @@
-    es_descriptor.p_decConfigDescr =
-            malloc( sizeof( MP4_descriptor_decoder_config_t ));
+    if( es_descriptor.p_decConfigDescr == NULL )
+    {
+        free( es_descriptor.psz_URL );
+        goto error;
+    }
-
-    MP4_GET1BYTE( es_descriptor.p_decConfigDescr->i_objectTypeIndication );
@@ -984 +1001 @@
-    es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = i_len;
-    es_descriptor.p_decConfigDescr->p_decoder_specific_info = malloc( i_len );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-#undef es_descriptor
-}
-
-static void MP4_FreeBox_esds( MP4_Box_t *p_box )
-{
-    FREENULL( p_box->data.p_esds->es_descriptor.psz_URL );
-    if( p_box->data.p_esds->es_descriptor.p_decConfigDescr )
-    {
-        FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr->p_decoder_specific_info );
-    }
-    FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr );
-}
-
-static int MP4_ReadBox_avcC( stream_t *p_stream, MP4_Box_t *p_box )