From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sat, 1 Mar 2008 18:25:25 +0000 (+0000)
Subject: Another malloc check
X-Git-Tag: 0.9.0-test0~2403
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=34610e09541e4fe48dd9767604dd2f11a0cbc41b;p=vlc

Another malloc check
---

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 5d25e0f05d..01957ba052 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -377,12 +377,16 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
     if( ( p_box->data.p_ftyp->i_compatible_brands_count = i_read / 4 ) )
     {
         unsigned int i;
-        p_box->data.p_ftyp->i_compatible_brands =
-            calloc( p_box->data.p_ftyp->i_compatible_brands_count, sizeof(uint32_t));
+        uint32_t *tab = p_box->data.p_ftyp->i_compatible_brands =
+            calloc( p_box->data.p_ftyp->i_compatible_brands_count,
+                    sizeof(uint32_t));
+
+        if( tab == NULL )
+            p_box->data.p_ftyp->i_compatible_brands_count = 0;
 
         for( i =0; i < p_box->data.p_ftyp->i_compatible_brands_count; i++ )
         {
-            MP4_GETFOURCC( p_box->data.p_ftyp->i_compatible_brands[i] );
+            MP4_GETFOURCC( tab[i] );
         }
     }
     else