Changeset fcbf24b4e9cd444703948eb6d36da763a7e641f5

Timestamp:

01/03/08 19:20:01 (9 months ago)

Author:

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

git-committer:

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

git-parent:

[80af71f72f1ac98a372f8a75ebca09d3430c7192]

git-author:

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

Message:

Check some malloc() failures - yes it can happen when the alloc size is variable. Unfortunately, the MP4 code seems pretty hopeless.

Files:

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

modules/demux/mp4/libmp4.c

@@ -69 +69 @@
-        const int __i_copy__ = strnlen( (char*)p_peek, i_read-1 );  \
-        p_str = malloc( __i_copy__+1 );               \
-
-
+
+
+
+
+
-        p_peek += __i_copy__ + 1;   \
-        i_read -= __i_copy__ + 1;   \
@@ -589 +592 @@
-{
-    int32_t i_reserved;
+    int code = 0;
-
-    MP4_READBOX_ENTER( MP4_Box_data_hdlr_t );
@@ -604 +608 @@
-    if( i_read > 0 )
-    {
-
+
+
+
-
-        /* Yes, I love .mp4 :( */
@@ -615 +621 @@
-            i_copy = __MIN( i_read, i_len );
-
-_box->data.p_hdlr->psz_name
+sz
-            p_box->data.p_hdlr->psz_name[i_copy] = '\0';
-        }
-        else
-        {
-_box->data.p_hdlr->psz_name
+sz
-            p_box->data.p_hdlr->psz_name[i_read] = '\0';
-        }
@@ -631 +637 @@
-
-#endif
-
+
+
+
+
-}
-
@@ -892 +901 @@
-            MP4_GET1BYTE( i_len );
-            es_descriptor.psz_URL = malloc( i_len + 1 );
-
-
+
+
+
+
+
-            p_peek += i_len;
-            i_read -= i_len;
@@ -948 +960 @@
-    es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = i_len;
-    es_descriptor.p_decConfigDescr->p_decoder_specific_info = malloc( i_len );
-
-
+
+
+
-
-    MP4_READBOX_EXIT( 1 );
@@ -977 +990 @@
-    if( p_avcC->i_avcC > 0 )
-    {
-
-
+
+
+
-    }
-